]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Sat, 25 Oct 2014 10:05:34 +0000 (12:05 +0200)
committerAnatol Belski <ab@php.net>
Sat, 25 Oct 2014 10:05:34 +0000 (12:05 +0200)
commit470a2e1a8e6e205e24910c8d4b947a8032f0a08b
tree08d8084ffa38673333729b8a3f65bd4c7ab1d843
parent1fbc93512f02983f594e3b22d5cbb8ca4bc071b1
parent3794431b7818cb1a8ed1464dd89428ea8011cee2
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libmagic.patch in 5.6
  updated libmagic.patch in 5.5