]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d5c032 f962260)
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Thu, 25 Oct 2012 07:42:18 +0000 (09:42 +0200)
committerAnatoliy Belsky <ab@php.net>
Thu, 25 Oct 2012 07:42:18 +0000 (09:42 +0200)
* PHP-5.4:
  merged changes for bug #63297 from 5.3

Conflicts:
NEWS


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