]> granicus.if.org Git - php/commitdiff
fix merge
authorRemi Collet <remi@php.net>
Tue, 4 Mar 2014 12:46:21 +0000 (13:46 +0100)
committerRemi Collet <remi@php.net>
Tue, 4 Mar 2014 12:46:21 +0000 (13:46 +0100)
1  2 
ext/fileinfo/libmagic/softmagic.c

Simple merge