]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 22 Jan 2015 09:17:14 +0000 (10:17 +0100)
committerAnatol Belski <ab@php.net>
Thu, 22 Jan 2015 09:17:14 +0000 (10:17 +0100)
commit60c2621b2a9a82f0a31988aa58a3be9192184bdf
tree62685e7790f4605aac7cca0ade1cb6ecc24fc966
parenta2e83332b96b69a6b512ff65200aae9f30258ebf
parent43652d386a753c0a280790525e3593ecb416793c
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  simplify error handling for dirs as magic
ext/fileinfo/libmagic/apprentice.c