]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 1 Jul 2014 08:27:38 +0000 (10:27 +0200)
committerAnatol Belski <ab@php.net>
Tue, 1 Jul 2014 08:27:38 +0000 (10:27 +0200)
commit4965d1c2ce8981fcdb21eb6fef185cfec0bb737f
tree825a63d90d80c12b5c54e33551544a28556c0f0f
parente5fdb5b3f02fcb61efa5aa7d6e5ccd15838470a2
parentaf5f997a5d388d22411e84c421bec71064c56b61
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch