Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update gitignore and Makefile for additional entries

.gitignore

@@ -206,6 +206,8 @@ ext/pdo_sqlite/sqlite3.h
 ext/pdo_sqlite/tests/*.db
 ext/pdo_sqlite/tests/*.tmp
 ext/phar/phar.phar
+ext/phar/phar.1
+ext/phar/phar.phar.1
 ext/pspell/tests/*.tmp
 ext/reflection/xml
 ext/reflection/html
@@ -237,12 +239,14 @@ sapi/apache/libphp5.module
 sapi/apache2handler/libphp5.module
 sapi/apache_hooks/libphp5.module
 sapi/cgi/php-cgi
+sapi/cgi/php-cgi.1
 sapi/cli/php.1
 sapi/fpm/php-fpm
 sapi/fpm/php-fpm.1
 sapi/fpm/init.d.php-fpm
 sapi/fpm/php-fpm.conf
 sapi/fpm/fpm/php-cgi
+sapi/phpdbg/phpdbg
 scripts/php-config
 scripts/phpize
 scripts/man1/*.1

Makefile.global

@@ -115,6 +115,7 @@ clean:
 	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
+	find . -name \*.1 | xargs rm -f
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean