From 04cb78947a0bac9bf8cfd8d5227b3975db516d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 1 Jul 2011 04:23:31 -0700
Subject: [PATCH] Edited CHANGELOG.rdoc via GitHub

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

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 13be26ca..c0e347b6 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,6 @@
+* bug fix
+  * Properly deprecate setup_mail
+
 == 1.4.2
 
 * bug fix