Merge branch '2012.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Feb 2013 10:16:37 +0000 (11:16 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Feb 2013 10:16:37 +0000 (11:16 +0100)
Conflicts:
tine20/Setup/Controller.php

1  2 
scripts/packaging/build-tine20-packages.sh
tine20/Setup/Controller.php

Simple merge