Merge branch 'release/3.0.1' 3.0.1
authorAlex Kellner <alexander.kellner@in2code.de>
Thu, 8 Oct 2015 11:50:08 +0000 (13:50 +0200)
committerAlex Kellner <alexander.kellner@in2code.de>
Thu, 8 Oct 2015 11:50:08 +0000 (13:50 +0200)

Trivial merge