From: Pierre Joye <pierre.php@gmail.com>
Date: Mon, 10 Mar 2014 15:30:05 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.11RC1~22^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a92240e2092a87456c0d6e81cde27c2ee59e1419;p=php

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

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

a92240e2092a87456c0d6e81cde27c2ee59e1419