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)
commit839adb9b0fc75e571a614de37470322287cfe4f2
treeb21d122b2d513a8377ef0da63505c0b0cba276e2
parentdb080d53a83ee24b4e855792aab01d23786b41d6
parent080b50f3447060ba00a54c2a2d2d9939ee315f26
Merge branch '2012.10'

Conflicts:
tine20/Setup/Controller.php
scripts/packaging/build-tine20-packages.sh
tine20/Setup/Controller.php