diff options
author | Matthew James Goins <mjgoins@openflows.com> | 2010-03-14 17:40:46 -0400 |
---|---|---|
committer | Matthew James Goins <mjgoins@openflows.com> | 2010-03-14 17:40:46 -0400 |
commit | dd71f5ec4a69c58f894f4f6961ca3786a192bc62 (patch) | |
tree | 1e5bb5331837afcf9f77187daaaebf15c93606d7 /changelog | |
parent | 970c7500631f46b5aa6279bf607c7d11ede7549e (diff) | |
parent | 3d46f5954da2bc9a2dd8d2ce35713136149c2983 (diff) |
Merge remote branch 'dkg/master'
Diffstat (limited to 'changelog')
-rw-r--r-- | changelog | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -3,6 +3,8 @@ monkeysphere (0.29~pre1) UNRELEASED; urgency=low * Fix man page typo about monkeysphere authorized_keys location * Monkeysphere should work properly even if the user has "armor" in their gpg.conf (closes MS #1625) + * monkeysphere keys-for-userid now respects MONKEYSPHERE_CHECK_KEYSERVER + environment variable (and defaults to true) -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Thu, 18 Feb 2010 12:38:43 -0500 |