Merge remote-tracking branch 'upstream/master' into tag-env-with-discriminator

This commit is contained in:
blahed 2014-05-06 13:07:39 -04:00
commit 6548f3debf

View file

@ -5,7 +5,6 @@ before_install:
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
- 2.1.1
- jruby-19mode