Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 2 May 2016 09:08:46 +0000 (11:08 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 2 May 2016 09:08:46 +0000 (11:08 +0200)
commit279eea0fc86de0b24636435370ec4e26bb40f096
tree750e96836062a81db6cfa98a8f1ab91f25a8fd2b
parent69121c2ac9a6f7474498e529e0809b6f123d4fa7
parent19b11b7662b4662ac1bb8b22ab5bf95ebccdcbb8
Merge branch '2015.11-develop' into 2016.03