Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Jun 2016 14:54:40 +0000 (16:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Jun 2016 14:54:40 +0000 (16:54 +0200)
commitae277f27bc83852a685fecc9e2541fd366cd08ca
treee8e6bea3ea135284220d8b57a1d3b0730cb861e7
parent09572b7840f758878c067329c266a8476a835951
parent65e75417d9db8f6e32522efd2824c62677213464
Merge branch '2015.11-develop' into 2016.03
tine20/Felamimail/Controller/Message.php