Merge branch 'master' of https://code.google.com/p/supertux
authorTobias Markus <tobbi@mozilla-uk.org>
Sun, 15 Mar 2015 15:18:37 +0000 (16:18 +0100)
committerTobias Markus <tobbi@mozilla-uk.org>
Sun, 15 Mar 2015 15:18:37 +0000 (16:18 +0100)

Trivial merge