From 08b32b7b021e9e5d5bfdc15f8ae42ddd77850998 Mon Sep 17 00:00:00 2001
From: Sandro Turriate <sandro.turriate@gmail.com>
Date: Wed, 7 Jul 2010 11:26:28 -0400
Subject: [PATCH] Update history

---
 History | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/History b/History
index 5001c84..a5e5fbd 100644
--- a/History
+++ b/History
@@ -1,7 +1,8 @@
 == 0.7.0 (master)
-* major enhancements
+* bug fixes
   * subclasses always merge into the parent's default_options and
-  default_cookies (l4rk)
+  default_cookies (l4rk).
+  * subclasses play nicely with grand parents. gh-49
 
 == 0.6.0 2010-06-13
 * major enhancements