Merge branch 'master' of https://github.com/google/google-api-ruby-client

Author: sqrrrl

.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.2
   - 2.0.0
-  - 2.1.0
+  - 2.1
+  - 1.9.3
   - rbx-2
-  - jruby-19mode
+  - jruby
 script: "bundle exec rake spec:all"
 before_install:
  - sudo apt-get update

google-api-client.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'extlib', '~> 0.9'
   s.add_runtime_dependency 'launchy', '~> 2.4'
   s.add_runtime_dependency 'retriable', '~> 1.4'
-  s.add_runtime_dependency 'activesupport', '~> 3.2'
+  s.add_runtime_dependency 'activesupport', '>= 3.2'
 
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'yard', '~> 0.8'