Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Nov 2014 09:32:12 +0000 (10:32 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Nov 2014 09:32:12 +0000 (10:32 +0100)
commitaed4e116b5630e546d3e4c83948c5fdc4ac011dc
treea47af6a34345c9ce38f9fd17d47afe37bf24629a
parent1efbea3bb9852181ac116311a9a01e02e37510a0
parent592a5e84326dd275f9dceb2d64cd6f5345d61603
Merge branch '2013.10' into 2014.09

Conflicts:
tests/tine20/Calendar/Import/ICalTest.php
tine20/Addressbook/Convert/Contact/Json.php
tine20/Calendar/Import/Ical.php
tine20/Tinebase/Frontend/Json/Abstract.php

Change-Id: Ifa3cdf497987dc59708dc9ad15a90d4dd1da82dc
tests/tine20/Calendar/Import/ICalTest.php
tine20/Addressbook/Convert/Contact/Json.php
tine20/Calendar/Backend/Sql.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Calendar/Frontend/Cli.php
tine20/Calendar/Import/Ical.php
tine20/Tinebase/Convert/Json.php
tine20/Tinebase/Frontend/Json/Abstract.php