Merge branch 'master' of https://code.google.com/p/supertux
authorBenjamin Leduc <g.benjamin.leduc@gmail.com>
Tue, 8 Apr 2014 23:47:42 +0000 (23:47 +0000)
committerBenjamin Leduc <g.benjamin.leduc@gmail.com>
Tue, 8 Apr 2014 23:47:42 +0000 (23:47 +0000)
Because I want:w.


Trivial merge