]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 748b376 09b6e33)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 29 Jan 2013 20:34:45 +0000 (12:34 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 29 Jan 2013 20:34:45 +0000 (12:34 -0800)
* PHP-5.4:
  branched 5.4.12
  update NEWS

Conflicts:
configure.in
main/php_version.h


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