Merge branch 'feature/menu-cleanup'
authorIngo Ruhnke <grumbel@gmail.com>
Sun, 10 Aug 2014 04:09:32 +0000 (06:09 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Sun, 10 Aug 2014 04:09:32 +0000 (06:09 +0200)

Trivial merge