From 5db6a68720950786adde207796efe9b0bf9055b9 Mon Sep 17 00:00:00 2001
From: Jonas Nicklas <jonas.nicklas@gmail.com>
Date: Mon, 31 Dec 2012 14:49:42 +0100
Subject: [PATCH] update history

---
 History.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index bfa355af..5d3b15ec 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,11 @@
-# master
+# Version 2.0.2
+
+Release date: 2012-12-31
+
+### Changed
+
+* Capybara no longer uses thin as a server if it is available, due to thread
+  safety issues. Now Capybara always defaults to WEBrick. [Jonas Nicklas]
 
 ### Fixed
 
@@ -7,6 +14,9 @@
 * Fix regression in 2.0.1 which caused node comparisons with non node objects
   to throw an exception [Kouhei Sotou]
 * A few changes to the specs, only relevant to driver authors [Jonas Nicklas]
+* Encoding error under JRuby [Piotr Krawiec]
+* Ruby 2 encoding fix [Murahashi Sanemat Kenichi]
+* Catch correct exception on server timeout [Jonathan del Strother]
 
 # Version 2.0.1