From: Stanislav Malyshev <stas@php.net>
Date: Wed, 16 Apr 2014 00:17:39 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~373^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea8370c29ac6940ce4acfe48688dfa2d9745cebd;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.29 is next
  5.5.12RC1 setup

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

ea8370c29ac6940ce4acfe48688dfa2d9745cebd