Merge branch 'master' into unified

mernen · mernen · commit 844949a5b526 · 2010-08-09T05:06:00.000-03:00
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+2010-08-09 (1.4.6)
+  * Fixed oversight reported in http://github.com/flori/json/issues/closed#issue/23,
+    always create a new object from the state prototype.
+  * Made pure and ext api more similar again.
 2010-08-07 (1.4.5)
   * Manage data structure nesting depth in state object during generation. This
     should reduce problems with to_json method definіtions that only have one
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4.5
+1.4.6
diff --git a/lib/json/version.rb b/lib/json/version.rb
@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.4.5'
+  VERSION         = '1.4.6'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
