]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
authorPierre Joye <pierre.php@gmail.com>
Mon, 10 Mar 2014 15:31:09 +0000 (16:31 +0100)
committerPierre Joye <pierre.php@gmail.com>
Mon, 10 Mar 2014 15:31:09 +0000 (16:31 +0100)
# By Anatol Belski
# Via Anatol Belski
* 'PHP-5.4' of git.php.net:php-src:
  updated libmagic.patch


Trivial merge