Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 3 May 2013 12:54:06 +0000 (14:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 3 May 2013 12:54:06 +0000 (14:54 +0200)
commit743549754a0f1da05da47e095f53186c88b31af4
treef8b8407e6a581e52df2d5c67e7134f12018dfa0e
parent03cfa6066d8d8fc2336817bd266c2f2327df0b24
parent630f78f0d022dbcb40ffd368c9ed56906b31885b
Merge branch '2013.03'

Conflicts:
tests/tine20/Calendar/JsonTests.php
tests/tine20/Calendar/JsonTests.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/js/widgets/ContentTypeTreePanel.js