Merge branch '4.2'

whatthejeff · whatthejeff · commit 3e68a39b432a · 2014-07-03T00:11:53.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,9 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - hhvm
   - hhvm-nightly
-  
+
 matrix:
     allow_failures:
         - php: hhvm
