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)
1  2 
tine20/Calendar/Frontend/WebDAV/Container.php
tine20/Tinebase/FileSystem.php

Simple merge