Merge commit 'dkg/master'
authorMatt Goins <mjgoins@openflows.com>
Sat, 31 Jan 2009 23:32:12 +0000 (18:32 -0500)
committerMatt Goins <mjgoins@openflows.com>
Sat, 31 Jan 2009 23:32:12 +0000 (18:32 -0500)
commit26bdfd9c0aa0853ca1ea80e1980e7e9849646e10
tree1a92ec7a3cc4df963bf8d3df82115c39ea4fe031
parent53f4ee78f320371a0f07865b21fdb4d6707a79d6
parent7d4b4815db8ba2f6f984a18a90b50032cf9158ba
Merge commit 'dkg/master'

Conflicts:

src/monkeysphere-host
src/monkeysphere-host
src/subcommands/mh/gen-key
src/subcommands/mh/import-key