diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-12 19:11:50 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-12 19:11:50 -0500 |
| commit | cadb991940633888988df530819ce9465cd688ed (patch) | |
| tree | 8f92a733796c6d77bc530e93299d6a92cc993c3d /etc/monkeysphere-authentication.conf | |
| parent | 387848dfa7081364094a71ff70f65bb1cbd83d8b (diff) | |
| parent | 472cb2447cded21c3279f314d6f9cf159d34f73f (diff) | |
Merge commit 'dkg/master'
Conflicts:
src/share/ma/setup
Diffstat (limited to 'etc/monkeysphere-authentication.conf')
0 files changed, 0 insertions, 0 deletions