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)
commit640bf34d57125bc61edc5b65478fac91bf42252e
treede22dfd217307f4e7c5515189a711b3f2bfb63b3
parentbe08b92355d62d53fc8856325a645b5fc99a3057
parent361600cf6548bc191b36f7942f595736aa506441
Merge branch '2013.03' into 2013.10

Conflicts:
tests/tine20/Calendar/RruleTests.php
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Calendar/RruleTests.php
tine20/Calendar/Controller/Event.php
tine20/Tinebase/Config.php