From 01c3e3d7e07a182db35797368ee580ecb036e679 Mon Sep 17 00:00:00 2001
From: Dave Goddard and Jacques Chester <pair+dgoddard+jchester@pivotal.io>
Date: Mon, 6 Oct 2014 11:19:29 -0400
Subject: [PATCH] Bump version to 1.0.5

---
 CHANGELOG | 5 +++++
 VERSION   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 959b2f1d7..616ca6ed1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+v1.0.5 Oct 06, 2014
+====================
+
+* Merge Heroku upstream change.
+
 v1.0.4 Sep 30, 2014
 ====================
 
diff --git a/VERSION b/VERSION
index a6a3a43c3..1464c521f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.4
\ No newline at end of file
+1.0.5
\ No newline at end of file