summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2013-02-04 13:02:14 -0800
committerFlorian Frank <flori@ping.de>2013-02-04 13:02:14 -0800
commit1b7961ce58d8a8da74616629b031d3462887af94 (patch)
tree80a21b7cc0dd949ed2ea25c9e00c484b8e744460
parent955e87bc2647c9cf28d0b1e61d1db5c886462850 (diff)
parentc5ef927b51a69e57e1959a1183995334e30b4e7d (diff)
downloadjson-1b7961ce58d8a8da74616629b031d3462887af94.tar.gz
Merge pull request #157 from zzak/master
merge r39046 from trunk
-rw-r--r--lib/json.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/json.rb b/lib/json.rb
index 00fe4ca..24aa385 100644
--- a/lib/json.rb
+++ b/lib/json.rb
@@ -1,3 +1,5 @@
+require 'json/common'
+
##
# = JavaScript Object Notation (JSON)
#
@@ -49,8 +51,6 @@
#
# 1.to_json => "1"
#
-
-require 'json/common'
module JSON
require 'json/version'