Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Mon, 9 Jun 2014 12:41:12 +0000 (14:41 +0200)
committerSebastian Harl <sh@tokkee.org>
Mon, 9 Jun 2014 12:41:12 +0000 (14:41 +0200)

Trivial merge