Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 1 Aug 2013 09:35:18 +0000 (11:35 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 1 Aug 2013 09:35:18 +0000 (11:35 +0200)
commitb0df2bb747e98b1b886634409349236c9af1b72e
tree26b14d3e11ab4c8a1b0612a1c123181dcd6a5928
parente82b4dcc9e1cd3f28b99b0a5db3ff83223420305
parentffa50ede4e984b6b69875e61bb658e63f1786b87
Merge branch '2013.03'

Conflicts:
tine20/Tinebase/Core.php
tine20/Tinebase/Core.php