Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Wed, 30 Apr 2014 20:58:52 +0000 (22:58 +0200)
committerSebastian Harl <sh@tokkee.org>
Wed, 30 Apr 2014 20:58:52 +0000 (22:58 +0200)
commit2e614bb5b95f81f5cc2f1f561ba070505c23f461
treea5856e46dbc95076692c0e7f51469bdd44505cf7
parent48df125e756096da52574e6ddbb12c1e84520227
parent92d47ccc3490cb245496853f8f6b89e68a9886a3
Merged branch 'master' of git://git.tokkee.org/sysdb.