Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 10 Nov 2015 08:29:23 +0000 (09:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 10 Nov 2015 08:29:23 +0000 (09:29 +0100)
commit83328b2480fb0058c4dfddb1e415f0fb69d4ec90
treed7e1d34862813d8c5b52fd17e107676d32e65a8d
parent5df3201c22d3f147f3a85c7a6f2289f25a1b496a
parentb3711634db7f50a64071a3c56c9c5101c69d2494
Merge branch '2014.11' into 2014.11-develop