From: Stanislav Malyshev <stas@php.net>
Date: Tue, 21 Jan 2014 21:28:03 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.9RC1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb6d1fcd3c592aba0a6fe8527dc3621fbf521aa0;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix CVE ref for bug #66060
  5.4.26 next
  fix news

Conflicts:
	configure.in
	main/php_version.h
---

eb6d1fcd3c592aba0a6fe8527dc3621fbf521aa0