Merge branch 'master' of https://code.google.com/p/supertux
authorBenjamin Leduc <benjaminleduc@Machin-chose-de-Benjamin.local>
Sat, 21 Sep 2013 19:48:34 +0000 (21:48 +0200)
committerBenjamin Leduc <benjaminleduc@Machin-chose-de-Benjamin.local>
Sat, 21 Sep 2013 19:48:34 +0000 (21:48 +0200)

Trivial merge