]> granicus.if.org Git - php/commit
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)
commit8391277fb87e26a769fb8f9bfc2e57d49aadae1d
tree0bb43f808b58995c5585ce1ad52097a0a4419fe2
parent28fa31d6e5000b1550d8d2b471fc0c2425165180
parentb9d494a33b4052afc93fd87382760702bbbbcd2f
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

# By Anatol Belski
# Via Anatol Belski
* 'PHP-5.4' of git.php.net:php-src:
  updated libmagic.patch