diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-08-15 15:02:56 -0700 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-08-15 15:02:56 -0700 |
| commit | cb05f332e617e346aa533d6dde02fb11c6148799 (patch) | |
| tree | acec015412602245075ac2f1e85c144c6cebd7e2 /debian/monkeysphere.dirs | |
| parent | 8cf936aa9d62f6e8655904375a2d8217f559947a (diff) | |
| parent | b0ea15c8e359a908583e08da0663d69e353c77dc (diff) | |
Merge commit 'dkg/master'
Conflicts:
src/monkeysphere-server
Resolved conflicts in revoke-hostname, and finish work on them.
Diffstat (limited to 'debian/monkeysphere.dirs')
0 files changed, 0 insertions, 0 deletions