Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jan 2016 16:25:47 +0000 (17:25 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jan 2016 16:25:47 +0000 (17:25 +0100)
commit27d312f18174faf56a15b86c261b71755ee89f65
treeb815a512687964f73912e4dbbf76e6de71327aaa
parentb7a0ddecec074b20c124a729de8e40b9d2d7fd31
parent2111d7f0684b177aa3fa6059f0384046d6994636
Merge branch '2015.11' into 2015.11-develop

Conflicts:
tine20/Tinebase/js/widgets/dialog/EditDialog.js

Change-Id: I5db8316d45ec94a8021760cf008132923bd0e29c
tine20/Tinebase/js/widgets/dialog/EditDialog.js