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)
commit4415fb6c2c0efd0c9822981acb00e6b8699b6ceb
tree5a8c67d8c1c7f1c3b540ba5906b595009fed5656
parent7113b37b87ab9182b7b2a28227f511c156987338
parent7ede471f21fde76ac0d6ecc5e0ea6484d73fabf0
Merge branch '2015.11-develop'
tine20/Setup/Controller.php