Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 25 Feb 2015 13:21:16 +0000 (14:21 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 25 Feb 2015 13:21:16 +0000 (14:21 +0100)
commit56f1b758864c0129844f8ff06fba281d8cfe8f61
tree40080788335dba16a72a315462a8261819a0734f
parent7d9d3d7554393414b68ce19fbdf2ac59a703025f
parenta33e39509e172023a874e99c399dc1db6b9a3252
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot

Change-Id: I27b9ee4dae192a652215ac488facb1e3a2a2d0c8
tine20/Calendar/js/EventEditDialog.js
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Tinebase/js/widgets/dialog/EditDialog.js