Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Mar 2016 13:10:06 +0000 (15:10 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Mar 2016 13:10:06 +0000 (15:10 +0200)
commitfb70ec9893e1184268fd593f71bddf8eb9c0dd29
tree2dcf831f280fc765f97858d2f0635abf7ae01cfb
parent132a54a42eb51f23c8709a57773f68c2c19410fe
parent9fbfb460d6d387f5168e5d6a7c559387541ccdcc
Merge branch '2015.11' into 2015.11-develop

Conflicts:
tine20/Tinebase/Config.php

Change-Id: I566fb9e763a6c869b95a217b9a1a0d59a7903d1d
tine20/Addressbook/js/ContactSearchCombo.js
tine20/Addressbook/js/Model.js
tine20/Calendar/js/AttendeeGridPanel.js
tine20/Tinebase/Config.php
tine20/Tinebase/js/common.js