Merge remote-tracking branch 'origin/develop' into develop
authordeclerambaul <fabian.kaelin@gmail.com>
Wed, 6 Jun 2012 15:02:17 +0000 (17:02 +0200)
committerdeclerambaul <fabian.kaelin@gmail.com>
Wed, 6 Jun 2012 15:02:17 +0000 (17:02 +0200)

Trivial merge