Merge remote-tracking branch 'origin/develop' into develop
authordeclerambaul <fabian.kaelin@gmail.com>
Thu, 7 Jun 2012 13:51:32 +0000 (15:51 +0200)
committerdeclerambaul <fabian.kaelin@gmail.com>
Thu, 7 Jun 2012 13:51:32 +0000 (15:51 +0200)

Trivial merge