Merge branch 'feature/savegame'
authorIngo Ruhnke <grumbel@gmail.com>
Mon, 11 Aug 2014 22:22:12 +0000 (00:22 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Mon, 11 Aug 2014 22:22:12 +0000 (00:22 +0200)

Trivial merge