Code

Merged branch 'master' of git://git.tokkee.org/sysdb/webui.
authorSebastian Harl <sh@tokkee.org>
Fri, 17 Apr 2015 20:12:05 +0000 (22:12 +0200)
committerSebastian Harl <sh@tokkee.org>
Fri, 17 Apr 2015 20:12:05 +0000 (22:12 +0200)

Trivial merge