Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:40:11 +0000 (10:40 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:40:11 +0000 (10:40 +0100)
commit45753f8256e38967dc99c6ecdf2355fb6b91b9d0
tree64432ccc4d5cefc307f6b5e2660ac9a6e90d4edf
parentf6060ceb639e7f53feba460ea024264c50c5283a
parent3535429a9855b8d43d5cea60b7a36e445b6815bc
Merge branch '2015.11' into 2015.11-develop