Merge branch 'hotfix/travistest'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Alex Bilbie 2013-12-02 18:48:09 +00:00
commit dd88426323

View File

@ -1,7 +1,6 @@
language: php language: php
php: php:
- 5.3
- 5.4 - 5.4
- 5.5 - 5.5