From: Jameson Rollins <jrollins@finestructure.net>
Date: Sat, 30 Oct 2010 00:22:18 +0000 (-0400)
Subject: update upstream changelog
X-Git-Tag: monkeysphere_0.35-1~1^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=83d8845a1edb5b31c0addd9d478fa2e647ee3ddb;p=monkeysphere.git

update upstream changelog
---

diff --git a/Changelog b/Changelog
index aca81f2..90514a0 100644
--- a/Changelog
+++ b/Changelog
@@ -1,8 +1,9 @@
-monkeysphere (0.35) upstream;
+monkeysphere (0.35~pre) upstream;
 
   * Remove reference to USE_VALIDATION_AGENT.
+  * Fix ssh_proxycommand for marginal hosts.
 
- -- Jameson Rollins <jrollins@finestructure.net>  Wed, 27 Oct 2010 10:46:28 -0400
+ -- Jameson Rollins <jrollins@finestructure.net>  Fri, 29 Oct 2010 20:21:54 -0400
 
 monkeysphere (0.34) upstream;