Merge branch 'master' of https://github.com/nobu/json into development

Conflicts:
	ext/json/ext/parser/parser.c

2 files changed, 2 insertions, 2 deletions

diff --git a/tests/test_json.rb b/tests/test_json.rb
index 825a507..b367e90 100755
--- a/tests/test_json.rb
+++ b/tests/test_json.rb
@@ -150,7 +150,7 @@ class TC_JSON < Test::Unit::TestCase
     assert_equal(@ary,
       parse('[[1],["foo"],[3.14],[47.11e+2],[2718.0E-3],[null],[[1,-2,3]]'\
       ',[false],[true]]'))
-    assert_equal(@ary, parse(%Q{   [   [1] , ["foo"]  ,  [3.14] \t ,  [47.11e+2] 
+    assert_equal(@ary, parse(%Q{   [   [1] , ["foo"]  ,  [3.14] \t ,  [47.11e+2]\s
       , [2718.0E-3 ],\r[ null] , [[1, -2, 3 ]], [false ],[ true]\n ]  }))
   end
 
diff --git a/tests/test_json_addition.rb b/tests/test_json_addition.rb
index c8bfb41..a8181e8 100755
--- a/tests/test_json_addition.rb
+++ b/tests/test_json_addition.rb
@@ -19,7 +19,7 @@ class TC_JSONAddition < Test::Unit::TestCase
     def ==(other)
       a == other.a
     end
-    
+
     def self.json_create(object)
       new(*object['args'])
     end