Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Dec 2014 13:09:24 +0000 (14:09 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Dec 2014 13:09:24 +0000 (14:09 +0100)
commit908b465835f70b64d39f4c1eeeeb3c95d2683725
tree55acffa037f8adae67eff358434f965923c60ebc
parent86e248a5fd318ade8a134c1ca439c6a9fb55610a
parent02413cd0d498c237e3f0c5ad415e45827cbe271e
Merge branch '2013.10' into 2014.09
tine20/Calendar/Convert/Event/VCalendar/Factory.php
tine20/HumanResources/Setup/Update/Release7.php
tine20/Tinebase/Record/RecordSet.php
tine20/Voipmanager/Setup/setup.xml