Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Sep 2015 13:25:26 +0000 (15:25 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Sep 2015 13:25:26 +0000 (15:25 +0200)
commita05c402076b872eaa651028599d385e3cf30d8a8
tree87660a1c820de3b7ecd63ab3761227433016fa95
parent60cc79d70a014816ea23bde7cda5fa376d9d6a41
parentfbc9ec3295dc451778167d48a3986d1cd4dfbfde
Merge branch '2014.11' into 2014.11-develop