]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e96d7c e8e6611)
Merge branch 'PHP-5.4'
authorJohannes Schlüter <johannes@php.net>
Tue, 8 May 2012 15:30:46 +0000 (17:30 +0200)
committerJohannes Schlüter <johannes@php.net>
Tue, 8 May 2012 15:30:46 +0000 (17:30 +0200)
* PHP-5.4:
  Fix #61704 (Crash apache, phpinfo() threading issue)
  Fix folding marks


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