From d71eda6f760bf4d42ef2e0ad53400f1ee8aea24d Mon Sep 17 00:00:00 2001
From: Ben Langfeld <ben@langfeld.me>
Date: Tue, 31 Jan 2012 23:39:05 +0000
Subject: [PATCH] [DOC] Changelog entry for AHN_ENV/RAILS_ENV untangling

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16c240c7..b799cbf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
   * Feature: Add log level helper methods to Console
   * Feature: Console's shutdown/exit method initiates the shutdown routine
   * Bugfix: Remove config option for auto-accept - hard-coded to true
+  * Bugfix: AHN_ENV and RAILS_ENV now do not interfere with each other when both are set, and ahn will boot in the RAILS_ENV if AHN_ENV is not set
 
 # 2.0.0.alpha2 - 2012-01-30
   * Change: Plugins no longer load dialplan/event/rpc/console methods using corresponding class methods