Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Dec 2015 16:21:48 +0000 (17:21 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Dec 2015 16:21:48 +0000 (17:21 +0100)
commitb4a3f00b530312d44ee5675d1e0369a4650ef796
treeec006748407a1a21da1ebbc8a2317343385da476
parentd745d545bf8cfdaea24ca572ef3fa39301a2a2f1
parentca21e979c9e49f2d487bfeb00ca1ebb743ba9381
Merge branch '2014.11-develop' into 2015.11
tine20/Calendar/Preference.php