Merge branch 'feature/developer-mode'
authorIngo Ruhnke <grumbel@gmail.com>
Tue, 19 Aug 2014 00:46:40 +0000 (02:46 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Tue, 19 Aug 2014 00:46:40 +0000 (02:46 +0200)

Trivial merge