Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Fri, 20 Dec 2013 19:09:48 +0000 (20:09 +0100)
committerSebastian Harl <sh@tokkee.org>
Fri, 20 Dec 2013 19:09:48 +0000 (20:09 +0100)

Trivial merge