From: Benjamin Leduc <g.benjamin.leduc@gmail.com>
Date: Thu, 14 Aug 2014 22:53:51 +0000 (+0000)
Subject: Merge branch 'master' of https://code.google.com/p/supertux
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0006b7d038f744a29e4037e1ca54f5acf305aa8f;p=supertux.git

Merge branch 'master' of https://code.google.com/p/supertux
Well
I work in same time than others :p
---

0006b7d038f744a29e4037e1ca54f5acf305aa8f