From 2f656c85c725c292d17f997a3b8dc2aef1a99392 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Tue, 21 Oct 2008 23:02:45 -0400
Subject: [PATCH] History

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

diff --git a/History.txt b/History.txt
index 26eb9242..70f95aca 100644
--- a/History.txt
+++ b/History.txt
@@ -2,6 +2,7 @@
 
 * Major enhancements
 
+  * Added Merb support (Gwyn Morfey, Jeremy Burks, Rob Kaufman)
   * Added #basic_auth(user, pass) to support HTTP Basic Auth (Aslak Hellesøy)
   * Added support for Sinatra and Rack (Aslak Hellesøy)
   * Added #within for manipulating the current page within a selector scope