Merge tag '2.1.0' into develop
authorAlex Kellner <alexander.kellner@in2code.de>
Mon, 15 Sep 2014 20:40:27 +0000 (22:40 +0200)
committerAlex Kellner <alexander.kellner@in2code.de>
Mon, 15 Sep 2014 20:40:27 +0000 (22:40 +0200)
Tagging version 2.1.0 2.1.0


Trivial merge