Merge "Use HPHP_VERSION constant to detect HipHop"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 3 Oct 2013 16:08:29 +0000 (16:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 3 Oct 2013 16:08:29 +0000 (16:08 +0000)

Trivial merge