From 2783a435023ffbb2777059b502129609da1f3d14 Mon Sep 17 00:00:00 2001
From: Chris Harper <charper@branched.co.uk>
Date: Fri, 19 Aug 2011 10:41:59 +0100
Subject: [PATCH] Add Jruby Include json with rbx

---
 .travis.yml | 1 +
 Gemfile     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1731cb92b..eeb360245 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - jruby
   - rbx-2.0
diff --git a/Gemfile b/Gemfile
index f759d235b..eb76900bd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,5 +8,5 @@ group :test do
   gem "mocha", "~> 0.9.7"
   gem "leftright", :platforms => :mri_18
   gem "yajl-ruby", "~>0.8.2", :platforms => :mri
-  gem "json", "~>1.5.3", :platforms => :jruby
+  gem "json", "~>1.5.3", :platforms => [:jruby, :rbx]
 end