Merge remote-tracking branch 'origin/develop' into develop
authordeclerambaul <fabian.kaelin@gmail.com>
Mon, 2 Jul 2012 13:55:28 +0000 (15:55 +0200)
committerdeclerambaul <fabian.kaelin@gmail.com>
Mon, 2 Jul 2012 13:55:28 +0000 (15:55 +0200)

Trivial merge