Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Sun, 27 Jul 2014 16:13:55 +0000 (18:13 +0200)
committerSebastian Harl <sh@tokkee.org>
Sun, 27 Jul 2014 16:13:55 +0000 (18:13 +0200)
commitde02a150937998ce92f38c66043514aea5c8dacb
treec143763ceaee74b82375ebdd64fc786418966e28
parent6b0247f801726c7536e0fa1a22aef88d15205b3a
parent1cea8dc9f3cb0c5579c68fcdf24e7b587ac3fe0e
Merged branch 'master' of git://git.tokkee.org/sysdb.