Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Sep 2015 15:49:06 +0000 (17:49 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Sep 2015 15:49:06 +0000 (17:49 +0200)
commite3fb96564326e93b6cf25dfa65dab735d4cfcd39
tree95fad761293d228b4021b9c039bfcab9e13bd457
parent1e36e7ccbd49516136613997a85655d6a85a579e
parentb790f652b7d42b0ad5379ec0c218cc27400b137f
Merge branch '2014.11-develop' into 2015.07
tine20/Felamimail/Controller/Message.php
tine20/Tinebase/User.php