]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Sat, 20 Sep 2014 23:42:12 +0000 (16:42 -0700)
committerArd Biesheuvel <ard.biesheuvel@linaro.org>
Sat, 20 Sep 2014 23:42:12 +0000 (16:42 -0700)
1  2 
ext/fileinfo/libmagic/apprentice.c

Simple merge