Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Fri, 27 Feb 2015 16:39:51 +0000 (17:39 +0100)
committerSebastian Harl <sh@tokkee.org>
Fri, 27 Feb 2015 16:39:51 +0000 (17:39 +0100)

Trivial merge