Merge branch 'feature/savegame'
authorIngo Ruhnke <grumbel@gmail.com>
Thu, 14 Aug 2014 03:24:14 +0000 (05:24 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Thu, 14 Aug 2014 03:24:14 +0000 (05:24 +0200)

Trivial merge