From 665bb97ef616e4de9c501f74db83f6ebc0ddc72a Mon Sep 17 00:00:00 2001
From: Julio Merino <jmmv@google.com>
Date: Mon, 8 Feb 2016 12:18:48 -0500
Subject: Document merge of osxfuse's sshfs

---
 ChangeLog | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6009dcf..02fee35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
+Draft notes for upcoming release
+--------------------------------
+
+* Integrated osxfuse's copy of sshfs, which means that sshfs now works
+  on OS X out of the box.
+
 Release 2.7 (2015-01-28)
 ------------------------
 
 * New maintainer (Nikolaus Rath <Nikolaus@rath.org>)
 
-
 Release 2.6 (2014-01-14)
 ------------------------
 
-- 
cgit v1.2.3