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)
commit61cbbccbefaacd388ebfd23e5e6cfe7320c03f3e
treef2072058e6e9b71839c370fd7139f62515098dac
parent15644f319c04d90acc399e633b936971808b9433
parentf75c1b56b8b58a44e8e8e794253735c921461ce1
Merge branch '2014.11-develop' into 2015.07
tine20/Tinebase/Frontend/Http.php
tine20/Tinebase/Tinebase.jsb2