Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 May 2013 12:52:47 +0000 (14:52 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 May 2013 12:52:47 +0000 (14:52 +0200)
1  2 
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Setup/Controller.php

Simple merge