]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6abd736 a213c10)
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Sat, 7 Jul 2012 19:52:35 +0000 (12:52 -0700)
committerStanislav Malyshev <stas@php.net>
Sat, 7 Jul 2012 19:52:35 +0000 (12:52 -0700)
* PHP-5.4:
  Added in NEWS and UPGRADING for feature 55218
  Adding in test for feature 55218
  Implements feature 55218

Conflicts:
UPGRADING


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