From 73d8b4ea3c0ed65d68f0c78710665416e3f089ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Solano=20G=C3=B3mez?= <daniel@solanogomez.org>
Date: Sat, 7 Jul 2012 22:29:53 -0500
Subject: [PATCH] Document latest updates

---
 Changelog.md | 12 ++++++++++++
 README.md    |  9 ++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5e2f3ba..4236f39 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,18 @@
 
 This page will list all of the latest changes in lein-tarsier.
 
+## 0.9.3 (unreleased)
+
+### New features
+
+* Now supports trampoline with Leiningen 2.
+
+### Bug fixes
+
+* Fix problem with `leiningen.core.project/merge-profile` introduced in recent
+  Leiningen 2 preview releases (thanks to Jeremy Holland).
+  [Issue 4](https://github.com/sattvik/lein-tarsier/issues/4)
+
 ## 0.9.2
 
 ### New features
diff --git a/README.md b/README.md
index ef30ce6..c3f0a94 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ Finally, you can override any profile- or project-based settings at the command
 
 ## Overriding the VimClojure server version
 
-This plug-in is configured to use version 2.3.1 of the VimClojure server by
+This plug-in is configured to use version 2.3.3 of the VimClojure server by
 default.  However, you can override this by manually specifying the dependency
 in your project.
 
@@ -102,10 +102,13 @@ of the animal that appears on the cover of _Learning the vi and Vim Editors_.
 
 There are a number of features that may be added to the plug-in:
 
-* The ability to run an initialisation script when launching the server
-* Adding more features the REPL, such as ClojureDocs support
 * The ability to hook onto other Leiningen commands
 
+## Contributors
+
+* Jeremy Holland
+* Katsunori Kanda
+
 ## License
 
 Copyright © 2012 Sattvik Software & Technology Resources, Ltd. Co.