Merge branch 'release/2.1.0' 2.1.0
authorAlex Kellner <alexander.kellner@in2code.de>
Mon, 15 Sep 2014 20:40:26 +0000 (22:40 +0200)
committerAlex Kellner <alexander.kellner@in2code.de>
Mon, 15 Sep 2014 20:40:26 +0000 (22:40 +0200)

Trivial merge