From fa48711e31c4d45819455e767ad106c41f9a92fe Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Sun, 28 Aug 2016 19:12:17 -0700
Subject: 39115: repair forced joining when (@) and (j) are used together

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 2d9ac8133..8bc9372d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
 	* 39112: Completion/X/Command/_x_utils: Use state_descr
 
+2016-08-28  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 39115: Src/subst.c, Test/D04parameter.ztst: repair forced
+	joining when (@) and (j) are used together (broken by 39019)
+
 2016-08-27  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* 39105: Completion/Unix/Type/_absolute_command_paths:
-- 
cgit 1.4.1