From 285c7cdb2b3127d6dad4c2288cf9af6f15de6545 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 21 Apr 2014 11:50:01 -0700
Subject: [PATCH] v1.5.4

---
 CHANGELOG.md | 2 +-
 version.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c47570b07..8ebd4191f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 1.5.4 (unreleased)
+## 1.5.4 (April 21, 2014)
 
 IMPROVEMENTS:
 
diff --git a/version.txt b/version.txt
index d6e9b7756..94fe62c27 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.5.4.dev
+1.5.4