Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Fri, 25 Apr 2014 22:51:05 +0000 (00:51 +0200)
committerSebastian Harl <sh@tokkee.org>
Fri, 25 Apr 2014 22:51:05 +0000 (00:51 +0200)

Trivial merge