upstream merge
update version
work on #46 (handle quit local consoles gracefully)
fix #46 ignore EOF
Revert "fix #46 ignore EOF"

This reverts commit 333264fdb718f337fb19d208e3d41aeef31f2ca1.
fix #46 ignore EOF
patch version
issues raised in #46, don't quit on CTRL+C if not executing
fix #50
Update NEWS
Add apparmor change hat functionality to fpm
Add --force-stderr to fpm
Add some basic and apparmor tests to fpm
fix indentation
added appropriate exception handling flag to ext\intl

According to the doc page
http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
it's appropriate as none of the extern C functions do throw
exceptions. This also fixes the warning C4530.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  added appropriate exception handling flag to ext\intl
  Update NEWS
Clarify always_populate_raw_post_data situation in 5.6
Add a couple of missing items to UPGRADING.

Usual grumble about please ensuring UPGRADING gets updated goes here. :)
remove goto from zend_try/zend_end_try/zend_catch blocks
...