From: Pierre Joye <pierre.php@gmail.com>
Date: Mon, 10 Mar 2014 15:28:41 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
X-Git-Tag: php-5.6.0beta1~3^2~114^2~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52a44a736bdfe6751c980c9cdc8d602d09db8899;p=php

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

# By Anatol Belski (2) and others
# Via Anatol Belski (3) and others
* 'PHP-5.6' of git.php.net:php-src:
  updated libmagic.patch
  updated libmagic.patch
  Fix indentation
  Do not remove *.1, it's not generated by make but configure
  Fix typo: entory -> entry
---

52a44a736bdfe6751c980c9cdc8d602d09db8899