# HG changeset patch
# User hodgestar
# Date 1359300845 0
# Node ID 9b08733965137743de0e28734c490e28b5477b01
# Parent  bfc77128929f58339f63ef489e3463837a8d2013
Merge r1228 from trunk (ChangeLog update).

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,31 +1,19 @@
-Version 0.7.1
-http://svn.edgewall.org/repos/genshi/tags/0.7.1/
-(Jan 26 2013, from branches/stable/0.7.x)
-
- * Fix infinite loop in interplotation lexing that was introduced by a change
-   in Python 2.7's tokenizer (see #540).
- * Fix handling of processing instructions without data (see #368).
- * Always include test packages (otherwise the source distribution files
-   become Python version dependent, see #539).
- * Fix text template test failures that were occurring on Windows.
- * Remove a couple of unnecessarily checks for unicode in template parsing.
- * Skip Mako benchmarks if Mako isn't installed (rather than failing
-   completely).
-
 Version 0.7
 http://svn.edgewall.org/repos/genshi/tags/0.7.0/
-(Dec 30 2012, from branches/stable/0.7.x)
+(Jan 27 2013, from branches/stable/0.7.x)
 
  * Add support for Python 3.1, 3.2 and 3.3 (via 2to3) and for PyPy. The
    majority of the coding was done in a sprint run by the Cape Town Python
    Users Group with financial assistance from the Python Software Foundation.
  * Default input and output encodings changed from UTF-8 to None (i.e. unicode
    strings).
+ * Skip Mako benchmarks if Mako isn't installed (rather than failing
+   completely).
 
 
 Version 0.6.1
 http://svn.edgewall.org/repos/genshi/tags/0.6.1/
-(Dec 30 2012, from branches/stable/0.6.x)
+(Jan 27 2013, from branches/stable/0.6.x)
 
  * Security fix to enhance sanitizing of CSS in style attributes. Genshi's
    `HTMLSanitizer` disallows style attributes by default (this remains
@@ -50,6 +38,10 @@
  * Fix handling of multiple events between or on either side of start and end
    tags in translated messages (see #404).
  * Fix test failures caused by changes in HTMLParser in Python 2.7 (see #501).
+ * Fix infinite loop in interplotation lexing that was introduced by a change
+   in Python 2.7's tokenizer (see #540).
+ * Fix handling of processing instructions without data (see #368).
+ * Updated MANIFEST.in so as not to rely on build from Subersion 1.6.
 
 
 Version 0.6