Add apparmor change hat functionality to fpm
upstream merge
update version
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012

Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
updated NEWS
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012

Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
improved the fix for bug #66395

- fixed the traverse vulnerability in case like c:d:file.txt
- ensure paths containing NTFS streams are still worky
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  improved the fix for bug #66395
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  improved the fix for bug #66395
  updated NEWS
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
Merge branch 'PHP-5.6'

* PHP-5.6:
  improved the fix for bug #66395
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
  updated NEWS
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
one more extension for the basename test
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  one more extension for the basename test
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  one more extension for the basename test
Merge branch 'PHP-5.6'

* PHP-5.6:
  one more extension for the basename test
[libxml] Unit test for libxml_disable_entity_loader()

Summary:
Test to make sure libxml_disable_entity_loader() is behaving.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  [libxml] Unit test for libxml_disable_entity_loader()
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  [libxml] Unit test for libxml_disable_entity_loader()
Merge branch 'PHP-5.6'

* PHP-5.6:
  [libxml] Unit test for libxml_disable_entity_loader()
Add --force-stderr to fpm
Add some basic and apparmor tests to fpm