Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 9 Jan 2014 14:20:41 +0000 (15:20 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 9 Jan 2014 14:20:41 +0000 (15:20 +0100)
commit65ca5683da2ec1393f28f0d93f7e546d3a2231cc
treef8e88c3d2ace5059f41c162e6963567f6de5091b
parentdf859ce42fd2a84ee8a6d4fca8d77543171ab4f2
parenta5d1bae90dc2d384f88c6c0727d318f74fe8f43b
Merge branch '2013.03' into 2013.10

Conflicts:
tests/tine20/Calendar/Controller/MSEventFacadeTest.php
tests/tine20/Calendar/TestCase.php
tine20/Calendar/Controller/MSEventFacade.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Tinebase/ActionQueue.php
tine20/Tinebase/js/widgets/form/RecordPickerComboBox.js
tests/tine20/Calendar/Controller/MSEventFacadeTest.php
tests/tine20/Calendar/TestCase.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Controller/MSEventFacade.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Calendar/js/AttendeeGridPanel.js
tine20/Tinebase/js/widgets/form/RecordPickerComboBox.js