Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Aug 2015 08:56:17 +0000 (10:56 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Aug 2015 08:56:17 +0000 (10:56 +0200)
commit191664369c0746dec1451209f22b05e40d5408ca
tree134b2567cc7f171180b593ed1e97738d0282d444
parent6d8f6242454b69a06340f42de0af28b895229a40
parent053de92496ac36f99aeb04a55e6939e33dce57b4
Merge branch '2014.11-develop' into 2015.07
tests/tine20/Felamimail/Frontend/ActiveSyncTest.php
tine20/Felamimail/Controller/Message.php