Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Dec 2016 12:13:16 +0000 (13:13 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Dec 2016 12:13:16 +0000 (13:13 +0100)
commit7ef680043a40657d9b851cb639d259c7e1ade836
tree7e58e540c3a6526dcbe4277eb872ef49b0baa015
parent6aaa2ae943e5e842495d78f488ca9c17547cff64
parentf4146467f45bd59d490b08ee561bd871527379f1
Merge branch '2016.11' into 2016.11-develop

Change-Id: I541083051a04dd7293c1053fe5a023e5c72675d7
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/Convert/Contact/VCard/Abstract.php
tine20/Felamimail/Controller/Message/Send.php
tine20/Tinebase/Controller.php