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

Merge branch 'PHP-5.6'

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

0e04d542e98c559b044c2a72a1f2b559b05f9702