From dcd601a7239c15f4ec82636890334b63c9f6abec Mon Sep 17 00:00:00 2001
From: Norman Clarke <norman@njclarke.com>
Date: Thu, 21 Mar 2013 00:35:58 -0300
Subject: [PATCH] Updated Changelog, bumped version

---
 CHANGELOG.md        | 8 +++++++-
 lib/haml/version.rb | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70e99161..decf46ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Haml Changelog
 
-## 4.0.1 (Unreleased)
+## 4.0.1
+
+Released March 21, 2013 ([diff](https://github.com/haml/haml/compare/4.0.0...4.0.1)).
 
 * Remove Rails 3.2.3+ textarea hack in favor of a more general solution.
 * Fix some performance regressions.
@@ -9,6 +11,10 @@
 (thanks [Alisdair McDiarmid](https://github.com/alisdair))
 * Fix support for sass-rails 4.0 beta.
 (thanks [Ryunosuke SATO](https://github.com/tricknotes))
+* Load "haml/template" in Railtie in order to prevent user options set in a
+  Rails initializer from being overwritten
+* Don't depend on Rails in haml/template to allow using Haml with ActionView
+  but without Rails itself. (thanks [Hunter Haydel](https://github.com/wedgex))
 
 ## 4.0.0
 
diff --git a/lib/haml/version.rb b/lib/haml/version.rb
index 6c2a36ea..4c7e44be 100644
--- a/lib/haml/version.rb
+++ b/lib/haml/version.rb
@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "4.0.1.rc.1"
+  VERSION = "4.0.1"
 end