Add apparmor change hat functionality to fpm
upstream merge
update version
Add --force-stderr to fpm
Add some basic and apparmor tests to fpm
work on #46 (handle quit local consoles gracefully)
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)

Conflicts:
	NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
fix #46 ignore EOF
Revert "fix #46 ignore EOF"

This reverts commit 333264fdb718f337fb19d208e3d41aeef31f2ca1.
fix #46 ignore EOF
patch version
move common code into a function
Merge branch 'master' of git.php.net:php-src
Fixed bug #66471 (Keep backward compatibility)
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #66471 (Keep backward compatibility)
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  move common code into a function
Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)