Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 15 Apr 2014 12:33:39 +0000 (14:33 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 15 Apr 2014 12:33:39 +0000 (14:33 +0200)
commit4255135375874bd279185fdff8b3c1c3610a3c60
treea1cdd577893ffb6c4725dbd7b51ef00ea570b20a
parent3fa27bd601d77b49bd027096fda2396a8a878b5e
parent1c298cc2258f4e4975a1b47c9e792dbf059d8489
Merge branch '2013.03' into 2013.10
tine20/Calendar/Frontend/Cli.php
tine20/Tinebase/Model/Alarm.php
tine20/Tinebase/Preference/Abstract.php
tine20/Tinebase/Server/Cli.php