Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 May 2016 10:34:11 +0000 (12:34 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 May 2016 10:34:11 +0000 (12:34 +0200)
1  2 
tine20/Calendar/js/CalendarPanelSplitPlugin.js
tine20/Tinebase/ActionQueue.php

Simple merge