Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Oct 2014 13:57:09 +0000 (15:57 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Oct 2014 13:57:09 +0000 (15:57 +0200)
commit6745f88da220ce0d3de879defcc311cb4d9a8e9f
tree993529f50378bddef80452b50b93298ed371d32a
parent64d55b5158189ab14de5e37d5ba3cd53ac031dd2
parentf309d3a8cf9bfbf9d55b201055c08339fb444fe3
Merge branch '2013.10' into 2014.09

Conflicts:
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml

Change-Id: Ie8fc5f520b9d110084d116b56fc9fd2dd58da441
tine20/Tinebase/Container.php
tine20/Tinebase/Frontend/Cli.php