Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 13 Jul 2015 11:07:45 +0000 (13:07 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 13 Jul 2015 11:07:45 +0000 (13:07 +0200)
commit1cd9a01eb27355cdb7c628fc2fd663b13cd3e721
tree270262c94097c3cc314a99bbf13968417995ef98
parente4ff122df3f33de5547acd167aa06445ed41ed1d
parent5139b85346cc4a136023b280971180992d08d83f
Merge branch '2014.11' into 2014.11-develop