Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Fri, 27 Jun 2014 16:08:29 +0000 (18:08 +0200)
committerSebastian Harl <sh@tokkee.org>
Fri, 27 Jun 2014 16:08:29 +0000 (18:08 +0200)

Trivial merge