Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Fri, 11 Apr 2014 06:44:10 +0000 (08:44 +0200)
committerSebastian Harl <sh@tokkee.org>
Fri, 11 Apr 2014 06:44:10 +0000 (08:44 +0200)

Trivial merge