From: Keyur Govande <keyur@php.net>
Date: Wed, 30 Jul 2014 02:41:01 +0000 (+0000)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~48^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0278589e1583855e04ee04bfe30ccef3e9ccda2;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
---

f0278589e1583855e04ee04bfe30ccef3e9ccda2