From: Adam Harvey <aharvey@php.net>
Date: Tue, 15 Jan 2013 07:50:57 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha4~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bf937f9bf12372a482ced3f2231f53c8be6ce4c;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
---

8bf937f9bf12372a482ced3f2231f53c8be6ce4c