Merge branch 'release/2.0.2'
authorAlex Kellner <alexander.kellner@in2code.de>
Thu, 15 May 2014 07:32:07 +0000 (09:32 +0200)
committerAlex Kellner <alexander.kellner@in2code.de>
Thu, 15 May 2014 07:32:07 +0000 (09:32 +0200)

Trivial merge