Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 09:28:20 +0000 (11:28 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 09:28:20 +0000 (11:28 +0200)
commit279aeb8a311d90b7dd65aa94521734a858fa5857
tree9c7d7fa2ebcb4a03f80c439830e609893d797884
parentf91e0901344bf631028d73203f75083f55aafeac
parent5e34ac65f710a555f262e61fec44f58cc287eb65
Merge branch '2015.11-develop' into 2016.03

Conflicts:
tine20/library/Zend/Locale/Format.php

Change-Id: Ieaa0b5363a5d48e521ea79b7c16b5cb5d47bacfe
tests/tine20/Addressbook/JsonTest.php