merging from jrollins
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 31 Jan 2009 23:30:59 +0000 (18:30 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 31 Jan 2009 23:30:59 +0000 (18:30 -0500)
commitc700e9b0dcede303ed1f160ba51f564fd314d2e3
tree579690c1cb9e9112aa2fe4924a1c570fee357dcf
parent7d4b4815db8ba2f6f984a18a90b50032cf9158ba
parent0d36aebed69b154903e158a4c0f5cc8707cf5168
merging from jrollins
src/monkeysphere-host
src/subcommands/mh/gen-key
src/subcommands/mh/import-key