Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Fri, 27 Jun 2014 16:08:29 +0000 (18:08 +0200)
committerSebastian Harl <sh@tokkee.org>
Fri, 27 Jun 2014 16:08:29 +0000 (18:08 +0200)
commit4436642effe44c7d891bdcc4b207aeddb1c0e43d
treed1c31b276a012f7ae6cd04a8ff14a3171e257b82
parent49a7df2864120d4b8e168a420c7364e5d01be7b0
parenta08b303ff95b7a03de4b5e19397f4ea352db1e47
Merged branch 'master' of git://git.tokkee.org/sysdb.