From: Keyur Govande <keyur@php.net>
Date: Wed, 30 Jul 2014 02:34:46 +0000 (+0000)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.16RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab4c4c3970f3c9d03a4f65a923fb31618d08a2c8;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

ab4c4c3970f3c9d03a4f65a923fb31618d08a2c8