Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
updated libmagic.patch after fix for #64830
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch after fix for #64830