Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 25 Aug 2015 16:12:31 +0000 (18:12 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 25 Aug 2015 16:12:31 +0000 (18:12 +0200)
1  2 
tine20/Tinebase/Frontend/Http.php
tine20/Tinebase/Tinebase.jsb2

Simple merge
Simple merge