Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src

* 'fpm-apparmor-fixed' of https://github.com/notti/php-src:
  Add some basic and apparmor tests to fpm
  Add --force-stderr to fpm
  Add apparmor change hat functionality to fpm
fix #50
forked the test for bug #66481
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  forked the test for bug #66481
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  forked the test for bug #66481
Merge branch 'PHP-5.6'

* PHP-5.6:
  forked the test for bug #66481
Update NEWS
fix indentation
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  forked the test for bug #66481
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
Merge branch 'PHP-5.6'
Clarify always_populate_raw_post_data situation in 5.6
Merge branch 'PHP-5.6'

* PHP-5.6:
  Clarify always_populate_raw_post_data situation in 5.6