From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 2 Aug 2013 19:33:40 +0000 (-0400)
Subject: Merge commit 'ea75b1b' into PHP-5.5
X-Git-Tag: php-5.5.2~34^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ca79106615824fff1d3f97a1fd7dc9e2d051fb6;p=php

Merge commit 'ea75b1b' into PHP-5.5

* commit 'ea75b1b':
  This test needs local infile enabled
---

9ca79106615824fff1d3f97a1fd7dc9e2d051fb6