Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Mar 2016 10:38:34 +0000 (11:38 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Mar 2016 10:38:34 +0000 (11:38 +0100)
commit4b6017b5284893891bcea946e2c397e0b0761c13
tree6233ead61e28a8cac9f73017fe4bba57ff7865b1
parentb4d13a4cde5993e53c04fa29cfa96a4e034ee9d6
parent53f00de20fbde83cbc0e41d40c28b6799da81570
Merge branch '2014.11-develop' into 2015.11