Merge branch 'feature/menu-dialogs'
authorIngo Ruhnke <grumbel@gmail.com>
Mon, 25 Aug 2014 07:54:29 +0000 (09:54 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Mon, 25 Aug 2014 07:54:29 +0000 (09:54 +0200)

Trivial merge