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)
1  2 
tine20/Calendar/Frontend/Cli.php
tine20/Tinebase/Model/Alarm.php
tine20/Tinebase/Preference/Abstract.php
tine20/Tinebase/Server/Cli.php

Simple merge
Simple merge
Simple merge