]> granicus.if.org Git - php/commitdiff
Merge commit 'ea75b1b' into PHP-5.5
authorRasmus Lerdorf <rasmus@php.net>
Fri, 2 Aug 2013 19:33:40 +0000 (15:33 -0400)
committerRasmus Lerdorf <rasmus@php.net>
Fri, 2 Aug 2013 19:33:40 +0000 (15:33 -0400)
* commit 'ea75b1b':
  This test needs local infile enabled


Trivial merge