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
DI
Merge branch 'PHP-5.6'
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'

* PHP-5.6:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
Merge branch 'master' of git.php.net:php-src
inject it directly. This is not C++ and I don't want to use hacks with similar structures
that are binary compatible. Better be explicit.
Merge branch 'PHP-5.6'
Merge branch 'master' of git.php.net:php-src
Merge branch 'master' of git://github.com/php/php-src