]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d2d8e8 6e51989)
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 16 May 2012 14:40:29 +0000 (16:40 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 16 May 2012 14:40:29 +0000 (16:40 +0200)
* PHP-5.3:
  fd fix
  fix bug #61065 (cherry picked from commit a10e778bfb7ce9caa1f91666ddf2705db7982d68)


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