From: Benjamin Leduc <benjaminleduc@Machin-chose-de-Benjamin.local>
Date: Sat, 21 Sep 2013 19:48:34 +0000 (+0200)
Subject: Merge branch 'master' of https://code.google.com/p/supertux
X-Git-Url: https://git.octo.it/?p=supertux.git;a=commitdiff_plain;h=31031c24034f2fc9ac76418efd26a4a984c5bef8

Merge branch 'master' of https://code.google.com/p/supertux
---

31031c24034f2fc9ac76418efd26a4a984c5bef8