Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 27 Dec 2013 19:40:36 +0000 (20:40 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 27 Dec 2013 19:40:36 +0000 (20:40 +0100)
Conflicts:
tests/tine20/Calendar/RruleTests.php

1  2 
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Calendar/RruleTests.php
tine20/Calendar/Controller/Event.php
tine20/Tinebase/Config.php

Simple merge
Simple merge
Simple merge