Merge branch 'master' of https://code.google.com/p/supertux
authorBenjamin Leduc <g.benjamin.leduc@gmail.com>
Sat, 16 Aug 2014 03:01:20 +0000 (03:01 +0000)
committerBenjamin Leduc <g.benjamin.leduc@gmail.com>
Sat, 16 Aug 2014 03:01:20 +0000 (03:01 +0000)

Trivial merge