]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Tue, 30 Dec 2014 19:28:52 +0000 (20:28 +0100)
committerAnatol Belski <ab@php.net>
Tue, 30 Dec 2014 19:28:52 +0000 (20:28 +0100)
commitef19072af29668a4254785e59984e764f4dd532f
treef2ddc4e5fda442d1e15fd4a587add9c317edf496
parentfa0b5e2c6d9cc355c5bab7831c887fb29ed61b87
parentce6cbb3110254d5dd88e7fdbf198cbe893197042
Merge branch 'PHP-5.6'

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