Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 7 Jun 2016 13:58:08 +0000 (15:58 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 7 Jun 2016 13:58:08 +0000 (15:58 +0200)
commitd2d647ef17a4d2c3f6e58468d1ec65d255645001
treed0e5cb127594f0fd2fa3a0084406c917539a0088
parent7609897620148f56f1fce0ab81a5bb9576df8d84
parent2b44aeb917b9e3ee8fb07b79512429be6c4cebd4
Merge branch '2015.11' into 2015.11-develop

Conflicts:
tine20/Tinebase/js/extFixes.js

Change-Id: I1b4a6d34d03460c784156e94ba4c746693081847
tine20/Addressbook/js/ContactGrid.js
tine20/Tinebase/js/extFixes.js