Fixed get_resources() prototype comments
avoid clash when stdint.h was included after win32/php_stdint.h
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  avoid clash when stdint.h was included after win32/php_stdint.h
Merge branch 'PHP-5.6'

* PHP-5.6:
  avoid clash when stdint.h was included after win32/php_stdint.h
Fix bug #67878 program_prefix not honoured in man pages

- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
Fix bug #67878 program_prefix not honoured in man pages

- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
NEWS
Fix bug #67878 program_prefix not honoured in man pages

- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
NEWS
dtor handler must be set
Fixed incorrect string length comparison
Avoid reallocation and copying
only run this test if SimpleXML is loaded
Merge branch 'master' of https://github.com/php/php-src
use a suitable number of patterns to show the bug is resolved, not a stupid number that could cause memory limit to be exceeded or other side effects
correct version number requirements for this test
fix the version requirements for these tests
remove bogus locale use from test
updated NEWS to fit last release
Separate values before conversion