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)
commitf382b8a03cef9cf2ca7b1f94c591aaa19d8874c3
treee24601b597d6c82b5e1a887195da4083959594f6
parent5f5456fff7b7575258683763e8bf1cf4ba5a403f
parente9feca3a2cbdd07cfedc24af87dd5a6248ab9465
Merge branch '2013.03'

Conflicts:
tine20/Tinebase/Server/Http.php
tine20/Setup/Controller.php
tine20/Tinebase/Server/Http.php