From: Nikita Popov <nikic@php.net>
Date: Sun, 1 Jul 2012 15:06:51 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~91^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ff60737f76d0d10277e22db5e713ee4bbebef2d;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix accidential change of php_version.h
---

4ff60737f76d0d10277e22db5e713ee4bbebef2d