Merge branch 'master' into 1515-local

This commit is contained in:
Arfon Smith
2014-09-17 09:54:45 -05:00
16 changed files with 56860 additions and 8 deletions

View File

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'json'
s.add_development_dependency 'mocha'
s.add_development_dependency 'pry'
s.add_development_dependency 'rake'
s.add_development_dependency 'yajl-ruby'
end