Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix for php bug #64802 includes test case

Conflicts:
	ext/openssl/openssl.c

diff --cc NEWS
index 948dcdc50db3f6fb167a7363dc87386201fdf35b,1e4e0fb9bba9dd18c3454e8bbdd1201285b1b97c..71aca12a15661bd6ea26c603c53135a21f4d3976
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,13 -1,6 +1,16 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.19
 +?? ??? 2013, PHP 5.5.3
 +
 +- Core:
 +  . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert)
 +  . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van Hees)
 +
++- Openssl:
++  . Fixed bug #64802 (openssl_x509_parse fails to parse subject properly in
++    some cases). (Mark Jones)
 +
 +15 Aug 2013, PHP 5.5.2
  
  - Core:
    . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference

diff --cc ext/openssl/openssl.c
Simple merge