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
updated libsqlite to 3.8.3.1 in 5.5 branch, too
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6