Merge branch 'master' of https://code.google.com/p/supertux
authorBenjamin Leduc <g.benjamin.leduc@gmail.com>
Thu, 14 Aug 2014 22:53:51 +0000 (22:53 +0000)
committerBenjamin Leduc <g.benjamin.leduc@gmail.com>
Thu, 14 Aug 2014 22:53:51 +0000 (22:53 +0000)
Well
I work in same time than others :p


Trivial merge