Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 11 Nov 2015 11:50:25 +0000 (12:50 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 11 Nov 2015 11:50:25 +0000 (12:50 +0100)
commit0584f15249104f44e045b493df1514cde852b225
treefdde36ef4de671ef37e061b8d32ab0c73f5d26bc
parent83fe82fbfa8bfb2156af4ad16b6ba4826fe0a4f8
parent9dbfd3d0df3c21fdeab645293cbd2dcab0bd7191
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Sales/Setup/Update/Release8.php
tine20/Sales/Setup/setup.xml

Change-Id: I44dc3e36c7ea64e250bc9eeb44b184bd2901f76c
tine20/Calendar/js/CalendarPanelSplitPlugin.js
tine20/Sales/Setup/Update/Release8.php
tine20/Sales/Setup/Update/Release9.php
tine20/Sales/Setup/setup.xml
tine20/Tinebase/Backend/Sql/Abstract.php