Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Sep 2015 10:38:50 +0000 (12:38 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Sep 2015 10:38:50 +0000 (12:38 +0200)
commit1e36e7ccbd49516136613997a85655d6a85a579e
tree5255977c61639f55725f59ede63dd25993dc013f
parent7e0a2df8c03d86d281448915d8e19f101715096d
parent8b48fd8270f2c9a97afc079b7b03fb2d6d620a85
Merge branch '2014.11-develop' into 2015.07