Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 May 2016 10:34:29 +0000 (12:34 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 May 2016 10:34:29 +0000 (12:34 +0200)
commit09572b7840f758878c067329c266a8476a835951
tree59004ecbb433ef61a20f63b36406823fde0c8d03
parent12e02ecf607160b0b5a2abdaab60bc63b4cbca26
parent934cfba0c055797aafdcfaf749a516f72817fb0d
Merge branch '2015.11-develop' into 2016.03