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)
Conflicts:
tine20/Setup/Controller.php

Change-Id: I4605dac9ee470a606e84a2b04361c40859125018

1  2 
tine20/Setup/Controller.php

Simple merge