]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b16f7c 16fdf86)
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)
* PHP-5.4:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
  Bump to next version

Conflicts:
configure.in
main/php_version.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.