Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Apr 2016 10:43:09 +0000 (12:43 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Apr 2016 10:43:09 +0000 (12:43 +0200)
commitd59f47a8b474cdb4b38a7c677ae62c9d864e4980
tree48e47e81171776e3827db824f00411625e61f06f
parent91ac00ecb216da8ea968e17d0deabf188eeb6e60
parent02fff24fc26e94db364c2e4a785ab668d9e3f2fc
Merge branch '2015.11-develop' into 2016.03