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

@@ -1,9 +1,11 @@
before_install:
before_install:
- git fetch origin master:master
- git fetch origin v2.0.0:v2.0.0
- git fetch origin test/attributes:test/attributes
- sudo apt-get install libicu-dev -y
- gem update --system 2.1.11
before_script:
- bundle exec rake samples
rvm:
- 1.9.3
- 2.0.0