Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Thu, 9 Jan 2014 06:51:32 +0000 (07:51 +0100)
committerSebastian Harl <sh@tokkee.org>
Thu, 9 Jan 2014 06:51:32 +0000 (07:51 +0100)

Trivial merge