Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sat, 31 Jan 2009 23:34:06 +0000 (18:34 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sat, 31 Jan 2009 23:34:06 +0000 (18:34 -0500)
1  2 
src/subcommands/mh/gen-key
src/subcommands/mh/import-key

Simple merge
Simple merge