Add apparmor change hat functionality to fpm
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6

* 'PHP-5.6' of https://git.php.net/repository/php-src:
  Fixed credits in phpdbg.* files
  Added breaking upon fatal-ish error
  credits file for phpdbg
  Fixed credits in phpdbg.* files
  reformat
  credits file
update credits headers
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Fixed credits in phpdbg.* files
  Added breaking upon fatal-ish error
  fix NEWS file for master
  credits file for phpdbg
  Fixed credits in phpdbg.* files
  reformat
  credits file
update credits
Fixed #18
Errors not displaying in some configurations
Merge branch 'master' of sapi/phpdbg into PHP-5.6

 merge is necessary,
Fixed #18
Errors not displaying in some configurations
Merge branch 'PHP-5.6'
fixed incompatible pointer in phpdbg on win64
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed incompatible pointer in phpdbg on win64
5.4.25 next
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.25 next

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.25 next
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.4.25 next
Fix test
Merge branch 'PHP-5.6'
Merge branch 'master' of git.php.net:php-src
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
upstream merge