Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Aug 2013 08:50:48 +0000 (10:50 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Aug 2013 08:50:48 +0000 (10:50 +0200)
commit7c5f98a3161252f29dc85430db2e06a21a72b135
tree8f7b2f9e993aa592e9bdc8ff02ee9231d5bb0c68
parente76b4ae80196bc799f0b6de3c69b3b915419b624
parent026a734693cc78a6fce4c2f9bbffd4fdcef753ef
Merge branch '2013.03'

Conflicts:
tine20/ActiveSync/Controller/Abstract.php
tine20/ActiveSync/Controller/Abstract.php