Merge branch 'v1.8'

Author: flori

.travis.yml

@@ -11,16 +11,17 @@ rvm:
   - 2.1
   - 2.2.1
   - 2.2.2
+  - 2.2.3
   - 2.2
+  - 2.3.0
   - ree
-  - rbx-2
-  - jruby-18mode
-  - jruby-19mode
   - ruby-head
 matrix:
+  include:
+    - rvm: jruby
+      env: JRUBY_OPTS="--2.0"
   allow_failures:
     - rvm: rbx-2
     - rvm: ruby-head
 script: "bundle exec rake"
-
 sudo: false

CHANGES

@@ -1,3 +1,12 @@
+2015-09-11 (1.8.5)
+  * There were still some mentions of dual GPL licensing in the source, but JSON
+    has just the Ruby license that itself includes an explicit dual-licensing
+    clause that allows covered software to be distributed under the terms of
+    the Simplified BSD License instead for all ruby versions >= 1.9.3. This is
+    however a GPL compatible license according to the Free Software Foundation.
+    I changed these mentions to be consistent with the Ruby license setting in
+    the gemspec files which were already correct now.
+---------- (1.8.4) Skipped.
 2015-06-01 (1.8.3)
   * Fix potential memory leak, thx to nobu.
 2015-01-08 (1.8.2)