Merge branch 'refs/heads/master' into develop

Conflicts:
	.travis.yml
	README.md
This commit is contained in:
Alex Bilbie
2013-09-26 11:18:10 +01:00
5 changed files with 51 additions and 31 deletions

View File

@@ -3,7 +3,7 @@ language: php
php:
- 5.3
- 5.4
- 5.5
before_script: composer install --prefer-source
script: phpunit --configuration phpunit.xml.dist