Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 May 2016 12:02:00 +0000 (14:02 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 May 2016 12:02:00 +0000 (14:02 +0200)
commit66388dd5865ba267ac1963f323bf4112426f7be5
treef9db03f8558891cf97b72039f340d9353c6c663f
parent66db345eca38fab60a09b02cede1d5682a22d468
parent706c30cd536c662db493553d09a0b5d15c22f5b3
Merge branch '2014.11' into 2015.11
tine20/Calendar/Frontend/WebDAV/Container.php
tine20/Tinebase/FileSystem.php