Merge branch 'feature/screenmanager'
authorIngo Ruhnke <grumbel@gmail.com>
Tue, 12 Aug 2014 08:38:36 +0000 (10:38 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Tue, 12 Aug 2014 08:38:36 +0000 (10:38 +0200)

Trivial merge