Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Sun, 27 Jul 2014 16:13:55 +0000 (18:13 +0200)
committerSebastian Harl <sh@tokkee.org>
Sun, 27 Jul 2014 16:13:55 +0000 (18:13 +0200)

Trivial merge