From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 2 Aug 2013 19:33:49 +0000 (-0400)
Subject: Merge commit 'ea75b1b'
X-Git-Tag: php-5.6.0alpha1~352
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c682f2f68aebf7c6a4bf7615beae8469d9d951cf;p=php

Merge commit 'ea75b1b'

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

c682f2f68aebf7c6a4bf7615beae8469d9d951cf