Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Tue, 13 Oct 2015 19:30:13 +0000 (21:30 +0200)
committerSebastian Harl <sh@tokkee.org>
Tue, 13 Oct 2015 19:30:13 +0000 (21:30 +0200)

Trivial merge