Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Sep 2015 13:25:41 +0000 (15:25 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Sep 2015 13:25:41 +0000 (15:25 +0200)
commit76c271670b15e9f3c5a4a6996daf3856dc21edc1
treeb2b6baf131a049ce3bb8e1883094822b64c7cfc5
parente7a155e20ed8ec01b864adef00ef86227fb35805
parenta05c402076b872eaa651028599d385e3cf30d8a8
Merge branch '2014.11-develop' into 2015.07
tine20/Felamimail/Message.php
tine20/Filemanager/translations/de.po
tine20/Tinebase/Frontend/Http.php