Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Jun 2013 13:44:19 +0000 (15:44 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Jun 2013 13:44:19 +0000 (15:44 +0200)
Conflicts:
tine20/Tinebase/Server/Http.php

1  2 
tine20/Setup/Controller.php
tine20/Tinebase/Server/Http.php

Simple merge
Simple merge