From c14d2f638c0b8aefa08aaf96db4c630ed5537147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Thu, 17 Jan 2013 10:10:59 +0100
Subject: update Changelog

---
 Changelog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 3986afc..d6ccf5c 100644
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,9 @@
-2013-01-08 Jérémy Zurcher <jeremy@asynk.ch>
+2013-01-XX Jérémy Zurcher <jeremy@asynk.ch>
 	* release 0.7
 	* zorglub.rb swallows version.rb
 	* before_all and after_all accept parameter or proc
+	* use instance variables instead of @options hash
+	* add optional cache_lifetime to static pages
 
 2013-01-08 Jérémy Zurcher <jeremy@asynk.ch>
 	* release 0.6
-- 
cgit v1.1-2-g2b99