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)
1  2 
tine20/Calendar/Preference.php

Simple merge