Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Mar 2016 11:45:12 +0000 (12:45 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Mar 2016 11:45:12 +0000 (12:45 +0100)
1  2 
tine20/Setup/Controller.php

Simple merge