From: Christopher Jones <sixd@php.net>
Date: Fri, 30 Mar 2012 17:48:45 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
X-Git-Tag: php-5.4.4RC1~170^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e8cab94d3d1b82fa2c127c317ef2f3cd79e9bd7;p=php

Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  trivial change try to ci a "fake" merge
  Fix test,  parameter signatures was introduced only into 5.4
  fix makedist for new tags
---

4e8cab94d3d1b82fa2c127c317ef2f3cd79e9bd7