Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Sun, 29 Jun 2014 15:35:39 +0000 (17:35 +0200)
committerSebastian Harl <sh@tokkee.org>
Sun, 29 Jun 2014 15:35:39 +0000 (17:35 +0200)

Trivial merge