Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Sep 2016 08:47:20 +0000 (10:47 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Sep 2016 08:47:20 +0000 (10:47 +0200)
commit1b47c0571d1eafacaccfe49e653e79b8973f87d4
treed0fe271db9fe6fab934275298faf40eafa5d21e0
parent49059e42999f40662afa27246f091c34d4977fee
parentfe4daeb6302a968b17a5f1a022d367ce37b2cdcf
Merge branch '2015.11' into 2015.11-develop

Change-Id: I4f84471511ea4b874dbd3f6db58c73b3bba43260
tine20/Addressbook/Config.php