From d60671cd3dc829dd47ed016192f7f05f6e43ff7c Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 14 Jun 2009 21:20:01 -0400
Subject: [PATCH] History

---
 History.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.txt b/History.txt
index 8c81f99..008a386 100644
--- a/History.txt
+++ b/History.txt
@@ -4,6 +4,7 @@
 
   * Improve performance (~2x) on JRuby by supporting Nokogiri
   * Added support for external app servers in selenium mode (basically don't start one) (Mike Gaffney)
+  * Added support for uploading files for Merb (Ryan Carver)
 
 * Minor enhancements