Merge branch 'master' of ssh://cccgit/hqdisplay
authortelegnom <max@chaos.expert>
Thu, 23 Jul 2015 17:48:10 +0000 (19:48 +0200)
committertelegnom <max@chaos.expert>
Thu, 23 Jul 2015 17:48:10 +0000 (19:48 +0200)

Trivial merge