From cb2efe876ff147122060ab2710a36237ac1d9b70 Mon Sep 17 00:00:00 2001
From: Lee Hambley <lee.hambley@gmail.com>
Date: Mon, 29 Apr 2013 09:38:39 +0200
Subject: [PATCH] Preparing Release v2.15.4

---
 CHANGELOG                 | 5 +++++
 lib/capistrano/version.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9cb7a167..4c11a0f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+## 2.15.4 / April 29 2013
+
+* Fix parallel command logging (@gnufied)
+* Fix a double-asset manifest problem on Rails upgrades. (@jimryan)
+
 ## 2.15.3 / April 25 2012
 
 * For deploy:cleanup, use try_sudo with rm command. (@joshstaiger)
diff --git a/lib/capistrano/version.rb b/lib/capistrano/version.rb
index bef409ff..5f788a99 100644
--- a/lib/capistrano/version.rb
+++ b/lib/capistrano/version.rb
@@ -2,7 +2,7 @@ module Capistrano
   class Version
     MAJOR = 2
     MINOR = 15
-    PATCH = 3
+    PATCH = 4
 
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{PATCH}"