Merge branch 'feature/menu-cleanup'
authorIngo Ruhnke <grumbel@gmail.com>
Fri, 8 Aug 2014 04:56:05 +0000 (06:56 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Fri, 8 Aug 2014 04:56:05 +0000 (06:56 +0200)

Trivial merge