]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25b3c94 f982aaa)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 27 Mar 2013 21:02:14 +0000 (14:02 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 27 Mar 2013 21:02:14 +0000 (14:02 -0700)
* PHP-5.4:
  will be 5.4.15
  fix NEWS

Conflicts:
configure.in
main/php_version.h


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