]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Fri, 4 May 2012 09:38:43 +0000 (11:38 +0200)
committerAnatoliy Belsky <ab@php.net>
Fri, 4 May 2012 09:38:43 +0000 (11:38 +0200)
commit7388c085bf6ed2d8b712990f31aa30191e969bde
tree750792a5b7e4a350846dd67cecbd32e7db214aa5
parent6b16f7cd690ecd9a32723c69d90888401c83914b
parent16fdf86ea3b4edd22373951aee59a82dc241f62e
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
  Bump to next version

Conflicts:
configure.in
main/php_version.h