Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Fri, 15 Aug 2008 22:02:56 +0000 (15:02 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Fri, 15 Aug 2008 22:02:56 +0000 (15:02 -0700)
commitcb05f332e617e346aa533d6dde02fb11c6148799
treeacec015412602245075ac2f1e85c144c6cebd7e2
parent8cf936aa9d62f6e8655904375a2d8217f559947a
parentb0ea15c8e359a908583e08da0663d69e353c77dc
Merge commit 'dkg/master'

Conflicts:

src/monkeysphere-server

Resolved conflicts in revoke-hostname, and finish work on them.
debian/changelog
src/common
src/monkeysphere-server