Code

Merge branch 'master' of git://git.tokkee.org/sysdb
authorSebastian Harl <sh@tokkee.org>
Sun, 25 Sep 2016 18:54:24 +0000 (20:54 +0200)
committerSebastian Harl <sh@tokkee.org>
Sun, 25 Sep 2016 18:54:24 +0000 (20:54 +0200)

Trivial merge