From 9733b478f085d5307c71ef17ddc0a9ec686ea710 Mon Sep 17 00:00:00 2001
From: capitaomorte <joaotavora@gmail.com>
Date: Wed, 9 Sep 2009 22:58:38 +0000
Subject: [PATCH] Last commit before branching for 0.6.1c

---
 doc/changelog.html | 13 ++++++++++++-
 doc/changelog.rst  | 11 +++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.html b/doc/changelog.html
index 7ca1bf9..2882eea 100644
--- a/doc/changelog.html
+++ b/doc/changelog.html
@@ -54,7 +54,18 @@
               for other versions can be found <a title=""
               href="http://code.google.com/p/yasnippet/downloads/list">here</a>.
             </p>
-            <div class="section" id="b-2009-08-29">
+            <div class="section" id="upcoming-0-6-1c">
+<h1>Upcoming 0.6.1c</h1>
+<ul class="simple">
+<li>Fixed <a class="reference external" href="http://code.google.com/p/yasnippet/issues">issues</a> 99, 98, 93,
+90, 91, 88, 87. Thanks everybody.</li>
+<li>More compliant customization group <a class="reference external" href="http://code.google.com/p/yasnippet/issues/detail?id=94">Issue94</a>, (thanks
+wyuenho).</li>
+<li>Added workaround for issue 97 in the FAQ</li>
+<li>Small updates to documentation.</li>
+</ul>
+</div>
+<div class="section" id="b-2009-08-29">
 <h1>0.6.1b / 2009-08-29</h1>
 <ul class="simple">
 <li>Much more powerful menu. See <a class="reference external" href="snippet-menu.html">The YASnippet menu</a>.</li>
diff --git a/doc/changelog.rst b/doc/changelog.rst
index 26eeaa7..6b61557 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -7,6 +7,17 @@ ChangeLog
 .. _Writing Snippets: snippet-development.html
 .. _The YASnippet Menu: snippet-menu.html
 
+Upcoming 0.6.1c
+===============
+
+* Fixed `issues <http://code.google.com/p/yasnippet/issues>`_ 99, 98, 93,
+  90, 91, 88, 87. Thanks everybody.
+* More compliant customization group `Issue94
+  <http://code.google.com/p/yasnippet/issues/detail?id=94>`_, (thanks
+  wyuenho).
+* Added workaround for issue 97 in the FAQ
+* Small updates to documentation.
+
 0.6.1b / 2009-08-29
 ===================