Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 5 Apr 2016 14:00:58 +0000 (16:00 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 5 Apr 2016 14:00:58 +0000 (16:00 +0200)
commitee535a20e15328da6d8dc3fa3efead3ac810e0bb
tree1af5ad3cdd2dae24ed60d26251d42845bccf1083
parente1cc21daecefdabebec764c45da8c7c3b58e4fbd
parente4f1d356e2849d81a9b479d416cca65b4eed5029
Merge branch '2015.11' into 2015.11-develop

Conflicts:
tests/tine20/Addressbook/Export/DocTest.php
tests/tine20/Addressbook/JsonTest.php

Change-Id: I918dba12e780ccb4e4ac0d1bd9559268d4627a70
tests/tine20/Addressbook/Export/DocTest.php
tests/tine20/Addressbook/JsonTest.php
tests/tine20/Calendar/Controller/EventTests.php
tine20/Addressbook/Setup/Initialize.php
tine20/Addressbook/js/ContactSearchCombo.js