From f5120b004399b16d94b543b84c7af275fab28ab7 Mon Sep 17 00:00:00 2001
From: dblock <dblock@dblock.org>
Date: Thu, 5 Jan 2012 10:14:17 -0500
Subject: [PATCH] Prevent multi_json from complaining by using a specific JSON
 library.

---
 .gitignore | 3 +++
 Gemfile    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 25a7896bd7..e7bb0a2f91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,7 @@ pkg
 dist
 Gemfile.lock
 
+## Rubinius
+.rbx
+
 ## PROJECT::SPECIFIC
diff --git a/Gemfile b/Gemfile
index 40958faf96..d76e99fd12 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,4 +9,5 @@ group :development, :test do
   gem 'guard-bundler'
   gem 'rb-fsevent'
   gem 'growl'
+  gem 'json'
 end