From ab54e1f66a91520a022f922ba1d42b96a706d588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 10 Nov 2011 09:32:13 -0200
Subject: [PATCH] Update CHANGELOG: Markerb templates.

---
 CHANGELOG.rdoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 2b377831..fe900586 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -5,6 +5,7 @@
   * devise_for now accepts :failure_app as an option
   * Models can select the proper mailer via devise_mailer method (by github.com/locomotivecms)
   * Migration generator now uses the change method (by github.com/nashby)
+  * Support to markerb templates on the mailer generator (by github.com/sbounmy)
 
 * bug fix
   * Allow idempotent API requests