From: Benjamin Leduc <g.benjamin.leduc@gmail.com>
Date: Tue, 8 Apr 2014 23:47:42 +0000 (+0000)
Subject: Merge branch 'master' of https://code.google.com/p/supertux
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=103a7ec74ba64e08cde3a1d55c8148e7b730b2d9;p=supertux.git

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

Because I want:w.
---

103a7ec74ba64e08cde3a1d55c8148e7b730b2d9