Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 12 Aug 2015 15:08:18 +0000 (17:08 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 12 Aug 2015 15:08:18 +0000 (17:08 +0200)
commit4ff331d6902f292863065fe21f9009c6e2d746fe
tree478e96b62edad675ca1512a3c22adbbc93782ad9
parentc9de48d8a85a30a3e8a2e6cfa60840ac18cae872
parent064fbf1fc3cff6b9b969a01438f784dd8060531f
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Calendar/Config.php

Change-Id: I18de2c91d8d975f08b61d58804f4f48f5b7ebe70
tine20/Calendar/Config.php