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)
commit6bda658d682fa2453c298d0262b9d7c64a29f5f3
tree56fbe8273faa7d8cc01f125464c9576cf294d1e3
parentbc5468c6b10f10fa52f7d4bde9a42dbd414858e5
parent74ddffd7a1160c3b72d32d5eddebc26781be98ea
Merge branch '2015.11-develop' into 2016.03

Change-Id: Ieebe9c69112314131ad49d93c82ad0df2fbc796a
tine20/build.xml