Merge branch '1.0'

* 1.0: Test against PHP 5.5 travis
igorw · Dec 29, 2012 · 4164980 · 4164980
2 parents 55c738d + 8b0918f
commit 4164980
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: php
 
 php:
   - 5.4
+  - 5.5
 
 before_script:
   - wget http://getcomposer.org/composer.phar