Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Dec 2015 14:24:34 +0000 (15:24 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Dec 2015 14:24:34 +0000 (15:24 +0100)
commiteddaddee766b6b2779d7cb3149d78ad365381297
tree6db8d81141721c81c85d8ccafc20d67d93497032
parente16b36b81f51bb5c4fdbc226002e204f6a7e2683
parentc88f2e0f2dd2863f4156eb92a1a0765839616863
Merge branch '2014.11-develop' into 2015.11

Conflicts:
tine20/Addressbook/js/SearchCombo.js

Change-Id: If65f094ad2094ffbd53fa300f6ed03c593279433
tine20/Addressbook/js/SearchCombo.js
tine20/Tinebase/Config.php
tine20/Tinebase/Frontend/Http.php