Commit a912181

committed

Merge remote branch 'origin/PHP-5.4' into 5.4

2 parents 593578c + d406f2b commit a912181Copy full SHA for a912181

3 files changed

+89

-103

lines changed

ext
- fileinfo
  - libmagic.patch
  - libmagic
    - funcs.c
- phar/tests
  - phar_oo_005.phpt

3 files changed

+89

-103

lines changed

Comments

(0)