Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 Jan 2016 11:54:38 +0000 (12:54 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 Jan 2016 11:54:38 +0000 (12:54 +0100)
commit3c4f54b53f0786265608112c1ce82701f637075d
tree7ae0e6eb2ac2dd4c7a6d3d77777160e275111909
parent6170fa85aa00e01a5db5befc79ba8a7f5651ebcc
parent6501b50509950d5596c2c72554c161396cca05bd
Merge branch '2014.11-develop' into 2015.11