Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Tue, 1 Jul 2014 20:01:13 +0000 (22:01 +0200)
committerSebastian Harl <sh@tokkee.org>
Tue, 1 Jul 2014 20:01:13 +0000 (22:01 +0200)

Trivial merge