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)
Conflicts:
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml

Change-Id: Ie8fc5f520b9d110084d116b56fc9fd2dd58da441

1  2 
tine20/Tinebase/Container.php
tine20/Tinebase/Frontend/Cli.php

Simple merge
Simple merge