]> granicus.if.org Git - php/commit
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)
commit15405e2abdbc2e1dd487a5424ee16c1b40095e71
tree64444914705aa8b803f9358f0c23b61b5ef72140
parentc3fd894d0af6e6dd5eb1b7cc27b945e3792f3642
parent1904cf696b08237ed7e63dbf018047cb8fd2eab5
Merge branch 'master' of https://git.php.net/repository/php-src

* '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