Merge tag '3.1.0' into develop
authorAlex Kellner <alexander.kellner@in2code.de>
Thu, 3 Dec 2015 19:44:13 +0000 (20:44 +0100)
committerAlex Kellner <alexander.kellner@in2code.de>
Thu, 3 Dec 2015 19:44:13 +0000 (20:44 +0100)
Tagging version 3.1.0 3.1.0


Trivial merge