Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 16 Feb 2016 10:05:15 +0000 (11:05 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 16 Feb 2016 10:05:15 +0000 (11:05 +0100)
commit1873f9850baba8a1e4d87ac09e11431c0bdc20f8
treee40572f1212dd010cb00342df0000cb6fc1f8739
parent349c3de64b28c8a8bd8e33e986810eb4e3c1c9c9
parentfc7ab1c76682e7298f4f262ba3d3a1de17e94b23
Merge branch '2015.11' into 2015.11-develop