Tue Apr  3 14:40:49 MDT 2012 - SPKI functions, recommended changes and patch for bug id #61421
Tue Apr  3 14:41:40 MDT 2012 - SPKI functions, recommended changes and patch for bug id #61421
Tue Apr  3 21:21:20 MDT 2012 - Additional checks for supported algorithm types
Tue Apr  3 22:27:41 MDT 2012 - Split SPKI family of test cases into individual files as requested
Sat Apr  7 21:02:37 MDT 2012 - Fixed segfaults and should just need to clean up any memory leaks
Wed Jan 23 08:49:01 MST 2013 - Synced upstream & patched current branch
Sun Apr 28 23:04:28 MDT 2013 - Resolving rebase
Merge branch 'issue-38917-spkac', remote branch 'upstream/master'
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: (22175 commits)
  fix valgrind warning
  Fix bug #64023 (__toString() & SplFileInfo)
  Fix test related to change for #bug64007 and also fix in newInstanceArgs
  NEWS: Start PHP 5.5.0 Beta 1 section
  NEWS for PHP 5.5.0alpha4
  Fix NEWS
  fix tests
  Merge fix of #62836 to ?.re, and regenerate ?.c
  Fixed bug #64007 (There is an ability to create instance of Generator by hand).
  - Fixed ZTS build
  Class Name Resolution As Scalar Via "class" Keyword
  fix bug #63462 (Magic methods called twice for unset protected properties)
  NEWS for bug #64011. See 77ee200
  Fix bug #64011 (get_html_translation_table())
  Update config.sub to latest GPLv2 upstream version
  Fixed bug #63988 (Two Date tests fail) only for PHP-5.5
  Fix skipif section
  Added ARM accelerated implementations for ZEND_SIGNED_MULTIPLY_LONG()
  Added test cases for ZEND_SIGNED_MULTIPLY_LONG()
  Fix News
  ...
Merge branch 'PHP-5.5'

* PHP-5.5:
  Sat Apr  7 21:02:37 MDT 2012 - Fixed segfaults and should just need to clean up any memory leaks
  Tue Apr  3 22:27:41 MDT 2012 - Split SPKI family of test cases into individual files as requested
  Tue Apr  3 21:21:20 MDT 2012 - Additional checks for supported algorithm types
  Tue Apr  3 14:41:40 MDT 2012 - SPKI functions, recommended changes and patch for bug id #61421
  Tue Apr  3 14:40:49 MDT 2012 - SPKI functions, recommended changes and patch for bug id #61421

Conflicts:
	ext/openssl/openssl.c
	ext/openssl/tests/openssl_spki_export.phpt
	ext/openssl/tests/openssl_spki_export_challenge.phpt
	ext/openssl/tests/openssl_spki_new.phpt
	ext/openssl/tests/openssl_spki_verify.phpt
Mon Apr 29 00:11:12 MDT 2013 - Merge
Mon Apr 29 01:12:33 MDT 2013 - Working copy