# HG changeset patch
# User Fredrik Lundh <fredrik@effbot.org>
# Date 1257428450 -3600
# Node ID a031e99b6a1aec4599e8ef36620d79feffe2d01d
# Parent  1e4aea265498a78d163f04befc7451b8dcc82251
Alpha release preparations.

diff -r 1e4aea265498a78d163f04befc7451b8dcc82251 -r a031e99b6a1aec4599e8ef36620d79feffe2d01d ChangeLog
--- a/ChangeLog	Thu Nov 05 14:33:15 2009 +0100
+++ b/ChangeLog	Thu Nov 05 14:40:50 2009 +0100
@@ -1,3 +1,11 @@
+Changes in current snapshot
+---------------------------
+
+  * Take default encoding into account -- if the system default encoding
+    is 'ascii', 'iso-8859-1', or 'utf-8', 8-bit strings will be properly
+    serialized as Unicode.
+  * Minor string encoding optimizations (about 5% faster on test setup).
+
 Changes in version 1.0.5
 ------------------------
 
diff -r 1e4aea265498a78d163f04befc7451b8dcc82251 -r a031e99b6a1aec4599e8ef36620d79feffe2d01d MANIFEST.in
--- a/MANIFEST.in	Thu Nov 05 14:33:15 2009 +0100
+++ b/MANIFEST.in	Thu Nov 05 14:40:50 2009 +0100
@@ -1,1 +1,2 @@
-include LICENSE ChangeLog MANIFEST.in build_inplace jsontest.py
+include LICENSE ChangeLog MANIFEST.in build_inplace jsontest.py jsonbench.py
+
diff -r 1e4aea265498a78d163f04befc7451b8dcc82251 -r a031e99b6a1aec4599e8ef36620d79feffe2d01d setup.py
--- a/setup.py	Thu Nov 05 14:33:15 2009 +0100
+++ b/setup.py	Thu Nov 05 14:40:50 2009 +0100
@@ -2,7 +2,8 @@
 
 from distutils.core import setup, Extension
 
-__version__ = "1.0.5"
+# __version__ = "1.0.5"
+__version__ = "1.0.6a1-effbot"
 
 macros = [('MODULE_VERSION', '%s' % __version__)]