]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorJohannes Schlüter <johannes@php.net>
Wed, 16 May 2012 14:41:23 +0000 (16:41 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 16 May 2012 14:41:23 +0000 (16:41 +0200)
* PHP-5.4:
  fd fix
  fix bug #61065 (cherry picked from commit a10e778bfb7ce9caa1f91666ddf2705db7982d68)


Trivial merge