From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 30 Mar 2012 12:57:25 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~360^2~7^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1904cf696b08237ed7e63dbf018047cb8fd2eab5;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  trivial change try to ci a "fake" merge
  Fix test,  parameter signatures was introduced only into 5.4
  fix makedist for new tags
---

1904cf696b08237ed7e63dbf018047cb8fd2eab5