Merge branch '2015.11-develop' into 2016.03 2016.03.3
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 10:14:58 +0000 (12:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 10:14:58 +0000 (12:14 +0200)
commit8eb4d60491b49988e9e8c6f42ee88094368d4964
treead8eb5faee237d389c631a7f3f3e91310ddbbfb8
parent2fb4c518eae2d3568a505c8d28a1a27afc8d44c2
parentf6f8d93fe422a2c4c0cd0d93cb59a4d5bd56a760
Merge branch '2015.11-develop' into 2016.03