Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 12 Dec 2014 09:24:50 +0000 (10:24 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 12 Dec 2014 09:24:50 +0000 (10:24 +0100)
commita81ce43ca78c43a4b6ccf97d4ca5cf36423cfd37
treeb51eaac5124bcd8984a1a2a7b6e4625aea5095ef
parente3625c818a8f1258963d0b082545169d5a3353cf
parent8bea5b6631940773a7523e26d1d5d34fbd9b7121
Merge branch '2013.10' into 2014.11
tine20/Admin/Frontend/Cli.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php