Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Aug 2015 09:05:35 +0000 (11:05 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Aug 2015 09:05:35 +0000 (11:05 +0200)
commit1dc1d96fcb3f9e4740a281832f1d744ad55f7bfb
treeb1538a0597851374e34182e98e38a183a73f2199
parent4616bd879122e538ab3c3b74dc325f1f1f5ac931
parent20051de220e6ee3a7fc4cfff0b7052c824ff15cd
Merge branch '2014.11-develop' into 2015.07