Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Sat, 7 Dec 2013 15:23:44 +0000 (16:23 +0100)
committerSebastian Harl <sh@tokkee.org>
Sat, 7 Dec 2013 15:23:44 +0000 (16:23 +0100)

Trivial merge