Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/12319] Backport Travis CI HHVM environment to develop-olympus.
This commit is contained in:
Joas Schilling 2014-03-29 17:50:07 +01:00
commit 3e281790e3

Diff content is not available