From: Stanislav Malyshev <stas@php.net>
Date: Tue, 18 Feb 2014 16:48:52 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54b1829f75f794c8af2803515365afa4ae11bc34;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news with CVE
  5.5.11-dev next
  5.5.11 next for NEWS

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

54b1829f75f794c8af2803515365afa4ae11bc34