Merge branch 'master' of git://git.code.sf.net/p/zsh/code

1 files changed, 22 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index a8dc3b9e0..524f54242 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2013-10-10  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 31810: Test/E02xtrace.ztst: tests for simple cases of XTRACE
+	output for conditions.
+
+	* 31809: Src/exec.c: make whitespace clear in trace output for
+	patterns.
+
+2013-10-08  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* Eric Cook: 31801: Completion/Linux/Command/_btrfs: some
+	additional variables need to be local.
+
+2013-10-08  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 31797: partly fix long-standing history expansion bug in which
+	in some circumstances a default history expansion would occur even
+	when there is neither an event nor a word designator, which is
+	contradictory to the documentation.  There are still some cases in
+	which expansion is attempted when it should not be, but in most of
+	those cases the expansion simply fails.
+
 2013-10-07  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 31794: Src/hist.c: further refinement that SHAREHISTORY should