Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Thu, 9 Jan 2014 06:51:32 +0000 (07:51 +0100)
committerSebastian Harl <sh@tokkee.org>
Thu, 9 Jan 2014 06:51:32 +0000 (07:51 +0100)
commit09f52d643f0c07cc0e0db33d7a5f72782390fc5a
tree18b406dbc158f99c29eb5a40f048120c0d2917de
parenta006a526f16e790dbeae6ef96ed61f506310b66f
parent48a129c98440237e81a316ca7b48a354d49bdc14
Merged branch 'master' of git://git.tokkee.org/sysdb.