Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 17 Sep 2013 13:45:50 +0000 (15:45 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 17 Sep 2013 13:45:50 +0000 (15:45 +0200)
commit2f83068d35175dc44789d960940a8e8143d15fee
treeca592dd0015bb4f6535911e28abcc20eeafeb087
parent43752895ec6a57026e55fcf4e48f7019bfb3d470
parent4dcd6e9945c8118b1546ed6786e7664477b17fa5
Merge branch '2013.03'

Conflicts:
tine20/Felamimail/translations/de.po
tine20/Tinebase/Record/Abstract.php
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tests/tine20/Calendar/JsonTests.php
tests/tine20/Felamimail/JsonTest.php
tine20/ActiveSync/Controller/Calendar.php
tine20/Calendar/Model/Event.php
tine20/Filemanager/js/NodeGridPanel.js
tine20/Tinebase/Record/Abstract.php