Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 08:53:35 +0000 (10:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 08:53:35 +0000 (10:53 +0200)
commit2a4c2b3ac8b843d5298643c0b8d0d1d1b0af5f63
tree0803e93cbb66cb6efcfe51fc8d72930b84741b1f
parent440565865ec1ceb99f7dd6761b24edd3d1064fc7
parent23f3e0de3d814bc3efbced0d7092317345f6f270
Merge branch '2015.11' into 2015.11-develop
tine20/Addressbook/Setup/setup.xml
tine20/Calendar/Convert/Event/Json.php
tine20/Calendar/Export/GenericTrait.php