Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 4 Feb 2015 12:34:19 +0000 (13:34 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 4 Feb 2015 12:34:19 +0000 (13:34 +0100)
1  2 
tests/tine20/Addressbook/JsonTest.php
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/js/EventUI.js
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/Import/Abstract.php

Simple merge
Simple merge
Simple merge
Simple merge