]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31a6f8b 5c5bc7c)
Merge branch 'PHP-5.3' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Fri, 1 Mar 2013 05:29:40 +0000 (21:29 -0800)
committerStanislav Malyshev <stas@php.net>
Fri, 1 Mar 2013 05:29:40 +0000 (21:29 -0800)
* PHP-5.3:
  5.4.24-dev
  5.3.23RC1

Conflicts:
configure.in
main/php_version.h


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