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)
Conflicts:
tine20/library/Zend/Locale/Format.php

Change-Id: Ieaa0b5363a5d48e521ea79b7c16b5cb5d47bacfe

1  2 
tests/tine20/Addressbook/JsonTest.php

Simple merge