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)
1  2 
tine20/Felamimail/Message.php
tine20/Filemanager/translations/de.po
tine20/Tinebase/Frontend/Http.php

Simple merge
Simple merge
Simple merge