Merge branch '2.3' into 2.6

* 2.3: [travis] start hhvm first
2015-07-02 08:16:16 +02:00 · 2015-07-02 08:16:16 +02:00 · 213cd6ac60
parent c6d9af374f 7c36f0b9a0
commit 213cd6ac60
1 changed files with 1 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -9,6 +9,7 @@ addons:

 matrix:
    include:
+        - php: hhvm
        - php: 5.3.3
        - php: 5.3
        - php: 5.4
@ -19,7 +20,6 @@ matrix:
        - php: 5.6
          env: deps=high
        - php: nightly
-        - php: hhvm
    allow_failures:
        - php: nightly
    fast_finish: true