Merge branch 'release/3.0.2' 3.0.2
authorAlex Kellner <alexander.kellner@in2code.de>
Wed, 4 Nov 2015 16:06:05 +0000 (17:06 +0100)
committerAlex Kellner <alexander.kellner@in2code.de>
Wed, 4 Nov 2015 16:06:05 +0000 (17:06 +0100)

Trivial merge