]> granicus.if.org Git - php/commit
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)
commit1f6f6194517b25fea8ed2e0c5c8b0d2e5ae07c1d
tree37fcf7af24032ce6e36840bb08866fe4b83e9534
parent4d2d8e871771be0342869e6710ef4e74346db1e7
parent6e519895011ea3ef43ce62c1050e72337af94b79
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fd fix
  fix bug #61065 (cherry picked from commit a10e778bfb7ce9caa1f91666ddf2705db7982d68)