Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 28 Jan 2015 18:49:52 +0000 (19:49 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 28 Jan 2015 18:49:52 +0000 (19:49 +0100)
commit8f710a6e6592dbf0f740d3d5f87306f8e1e5bc04
tree84748ac52432508001d35a8115398c5e763220d8
parent35dad574eaf2c931e5abc268a78439dc8d1881d8
parent27e5138345ccc325686f53c38a575a5844ca504e
Merge branch '2013.10' into 2014.11

Conflicts:
tests/tine20/ActiveSync/AllTests.php
tests/tine20/ActiveSync/TestCase.php
tests/tine20/Addressbook/Frontend/ActiveSyncTest.php
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tests/tine20/Tasks/Frontend/ActiveSyncTest.php

Change-Id: I5543782187ccaa555f94cc1213f30e70096508bf
tests/tine20/ActiveSync/AllTests.php
tests/tine20/ActiveSync/TestCase.php
tests/tine20/Addressbook/Frontend/ActiveSyncTest.php
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tests/tine20/Tasks/Frontend/ActiveSyncTest.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/js/EventEditDialog.js
tine20/Tinebase/js/widgets/grid/GridPanel.js