Merge tag '3.0.4' into develop
authorAlex Kellner <alexander.kellner@in2code.de>
Mon, 16 Nov 2015 13:36:54 +0000 (14:36 +0100)
committerAlex Kellner <alexander.kellner@in2code.de>
Mon, 16 Nov 2015 13:36:54 +0000 (14:36 +0100)
Tagging version 3.0.4 3.0.4


Trivial merge