From b1fc65530d822f84798582ad68da7e35d01ab1bc Mon Sep 17 00:00:00 2001
From: Henry Zhu <hi@henryzoo.com>
Date: Wed, 12 Oct 2016 11:58:11 -0400
Subject: [PATCH] v6.11.4 changelog [skip ci]

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d898665ea5..8fb96695f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,7 +57,9 @@ Module build failed: SyntaxError: Unexpected token, expected } (30:0)
      | ^
 ```
 
-## v6.11.4 (skipped)
+## v6.11.4 (2016-10-03)
+
+Temporary rollback for erroring on trailing comma with spread (#154) (Henry Zhu)
 
 ## v6.11.3 (2016-10-01)