Add apparmor change hat functionality to fpm
upstream merge
update version
Fixed bug #66395 basename function doesn't remove drive letter
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #66395 basename function doesn't remove drive letter
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66395 basename function doesn't remove drive letter
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #66395 basename function doesn't remove drive letter
updated NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
Fix bug #66286: Incorrect object comparison with inheritance

std_compare_objects immidiately returned 0 if the property tables
of both objects contain NULL at some index. Thus it would report
objects as equal even though properties following after that
differ.
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
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.
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