Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 2 Sep 2016 11:51:23 +0000 (13:51 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 2 Sep 2016 11:51:23 +0000 (13:51 +0200)
commit985e506dc5201a55ba12ace4ce0216e6f82bba07
treecfb17e36f940423301387da435437911cd6d5de7
parent2f0ba104d0890b7cf21d6dfe344652ffe7f6db1d
parent2fa75f6d25969e93060d43a567b21a280a7feb3a
Merge branch '2014.11' into 2015.11