merge trunk; update changes

1 files changed, 24 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 13fd83b..ee5d70b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,15 @@
-2013-08-30  Don Porter  <dgp@users.sourceforge.net>
+A NOTE ON THE CHANGELOG:
+Starting in early 2011, Tcl source code has been under the management of
+fossil, hosted at http://core.tcl.tk/tcl/ .  Fossil presents a "Timeline"
+view of changes made that is superior in every way to a hand edited log file.
+Because of this, many Tcl developers are now out of the habit of maintaining
+this log file.  You may still find useful things in it, but the Timeline is
+a better first place to look now.
+============================================================================
+
+2013-09-16  Don Porter  <dgp@users.sourceforge.net>
+
+	*** 8.6.1 TAGGED FOR RELEASE ***
 
 	* generic/tcl.h:	Bump version number to 8.6.1.
 	* library/init.tcl:
@@ -10,6 +21,18 @@
 	* unix/configure:	autoconf-2.59
 	* win/configure:
 
+2013-09-09  Donal Fellows  <dkf@users.sf.net>
+
+	* generic/tclOOMethod.c (CloneProcedureMethod): [Bug 3609693]: Strip
+	the internal representation of method bodies during cloning in order
+	to ensure that any bound references to instance variables are removed.
+
+2013-09-01  Donal Fellows  <dkf@users.sf.net>
+
+	* generic/tclBinary.c (BinaryDecodeHex): [Bug b98fa55285]: Ensure that
+	whitespace at the end of a string don't cause the decoder to drop the
+	last decoded byte.
+
 2013-08-03  Donal Fellows  <dkf@users.sf.net>
 
 	* library/auto.tcl: [Patch 3611643]: Allow TclOO classes to be found