Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Tue, 1 Jul 2014 20:01:13 +0000 (22:01 +0200)
committerSebastian Harl <sh@tokkee.org>
Tue, 1 Jul 2014 20:01:13 +0000 (22:01 +0200)
commit96808746f65d2cd3c738f926e0a2f7cff4f72cb5
treef58b21e10d27d9f53da01dc1472dd4dc323d7e74
parent130c971dd9197cd1e1724ea80b25c44d2cdd9b01
parente2cd874fdfec5130d6c5096a734961bc93bcae33
Merged branch 'master' of git://git.tokkee.org/sysdb.