diff options
author | Anatol Belski <ab@php.net> | 2014-02-20 19:01:09 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-02-20 19:01:09 +0100 |
commit | 0746e6af0861c22773aa414bcf6e59877bb7827d (patch) | |
tree | aae6299a3daddc95581635824de6c27387a8f93f | |
parent | 67d281f0937f5a7c7c7ff1905e02d5c5c50b4b7f (diff) | |
parent | e244e2245b9705329d92b92fb0d0d0f50d5af9a4 (diff) | |
download | php-git-0746e6af0861c22773aa414bcf6e59877bb7827d.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libmagic.patch in 5.4/5
0 files changed, 0 insertions, 0 deletions