Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Sep 2015 15:25:00 +0000 (17:25 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Sep 2015 15:25:00 +0000 (17:25 +0200)
commit630e95a2aaf0f8527f723f5fced49e50f0c36102
treed68d23d9bd3c05c383db126ddcc7303c85922990
parent34420f26422a63e0f7809e3ce8722f39e76943f7
parent00ec61faf09d97f448f035297fe0e6c184be7cf2
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Setup/Controller.php

Change-Id: I4605dac9ee470a606e84a2b04361c40859125018
tine20/Setup/Controller.php