Merge branch 'master' of https://code.google.com/p/supertux
authorTobias Markus <tobbi@mozilla-uk.org>
Tue, 17 Feb 2015 16:16:20 +0000 (17:16 +0100)
committerTobias Markus <tobbi@mozilla-uk.org>
Tue, 17 Feb 2015 16:16:20 +0000 (17:16 +0100)

Trivial merge