Merge branch 'master' into sass-scanner

korny · korny · commit 305e82571f7c · 2013-04-09T12:16:27.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,8 @@ spec/reports
 doc
 Gemfile.lock
 .rvmrc
+.ruby-gemset
+.ruby-version
 test/executable/source.rb.html
 test/executable/source.rb.json
 test/scanners
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
+source :rubygems
+
 # Specify your gem's dependencies in coderay.gemspec
 gemspec
 
@@ -9,6 +11,6 @@ group :development do
   gem "RedCloth", RUBY_PLATFORM == 'java' ? ">= 4.2.7" : ">= 4.0.3"
   gem "term-ansicolor"
   gem "shoulda-context", "~> 1.0.0"
-  gem "json" if RUBY_VERSION <  '1.9'
+  gem "json" if RUBY_VERSION < '1.9'
   gem "rdoc"
 end
