]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMichael Wallner <mike@php.net>
Wed, 30 Apr 2014 07:29:53 +0000 (09:29 +0200)
committerMichael Wallner <mike@php.net>
Wed, 30 Apr 2014 07:29:53 +0000 (09:29 +0200)
* PHP-5.6:
  BFN
  fix bug #64247 (CURLOPT_INFILE doesn't allow reset)


Trivial merge