]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff6b9a4 5894aa0)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Fri, 4 Jan 2013 01:27:19 +0000 (17:27 -0800)
committerStanislav Malyshev <stas@php.net>
Fri, 4 Jan 2013 01:27:19 +0000 (17:27 -0800)
* PHP-5.4:
  5.4.12-dev
  This will be PHP 5.3.22

Conflicts:
configure.in
main/php_version.h


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