Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Sun, 12 Jan 2014 18:19:56 +0000 (19:19 +0100)
committerSebastian Harl <sh@tokkee.org>
Sun, 12 Jan 2014 18:19:56 +0000 (19:19 +0100)

Trivial merge