make g++ see all the stdint.h stuff
Merge branch 'master' of github.com:weltling/php-src
Fixed get_resources() prototype comments
Merge remote-tracking branch 'php/master'
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
Merge remote-tracking branch 'php/master'
yet trivial fixes to mysql exts
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