Code

Merged branch 'master' of git://git.tokkee.org/sysdb.
authorSebastian Harl <sh@tokkee.org>
Fri, 25 Apr 2014 22:51:05 +0000 (00:51 +0200)
committerSebastian Harl <sh@tokkee.org>
Fri, 25 Apr 2014 22:51:05 +0000 (00:51 +0200)
commit3ba81224dac4d31ea5ad651db569543825ea5078
treea6015d93296c4261c5dd366f1dbff1ca001b5f1a
parent22ab0383bb3117c4ebe6addb0cdb18929fed1c0f
parent201fe7106cb2514f1d4f10c94a9f823b632184b3
Merged branch 'master' of git://git.tokkee.org/sysdb.