]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Fri, 30 Mar 2012 17:48:49 +0000 (10:48 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 30 Mar 2012 17:48:49 +0000 (10:48 -0700)
* 'master' 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


Trivial merge