Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Wed, 30 Apr 2014 20:58:52 +0000 (22:58 +0200)
committerSebastian Harl <sh@tokkee.org>
Wed, 30 Apr 2014 20:58:52 +0000 (22:58 +0200)

Trivial merge