Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Aug 2015 17:53:19 +0000 (19:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Aug 2015 17:53:19 +0000 (19:53 +0200)
commit34731d5983fbe8508f45ee67b9b8ccc3000895e6
tree0ed3c01d28af609e9b55aadaa5d1b4d00a41d4da
parentde365f7348f27a3367a5fcb18f360662f50c8085
parent37a54c7a5c735517b9cffb9e9da086d451b6f628
Merge branch '2014.11' into 2014.11-develop