]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69ed396 0a21b5d)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 21:46:30 +0000 (14:46 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 21:46:30 +0000 (14:46 -0700)
* PHP-5.4:
  fix test
  update NEWS


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