Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 13 Jul 2016 09:09:59 +0000 (11:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 13 Jul 2016 09:09:59 +0000 (11:09 +0200)
Change-Id: Ieebe9c69112314131ad49d93c82ad0df2fbc796a

1  2 
tine20/build.xml

Simple merge