Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test
  Add entry for bug #69354, fixed in 5.5.25
  Add CVE for bugs in 5.6.9
  Add entry about PCRE upgrade (rev 95fa7279)
  Add CVE for bugs in 5.5.25

Conflicts:
	ext/phar/tests/bug69441.phpt

diff --cc ext/phar/tests/bug69441.phpt
index 3e995e03c08bb5805baca28e3b65ba87dc85ce60,934c5f6b7359fb712516c760935f4238b79712dc..3536c3a83583c62b7d871516581abfd4d6078e3b
--- 1/ext/phar/tests/bug69441.phpt
--- 2/ext/phar/tests/bug69441.phpt
+++ b/ext/phar/tests/bug69441.phpt
@@@ -14,7 -14,7 +14,7 @@@ $r = new Phar($fname, 0)
  
  ==DONE==
  --EXPECTF--
- UnexpectedValueException: phar error: corrupted central directory entry, no magic signature in zip-based phar "%s%ebug69441.phar" in %s%ebug69441.php:%d
 -exception 'UnexpectedValueException' with message 'phar error: corrupted central directory entry, no magic signature in zip-based phar "%sbug69441.phar"' in %sbug69441.php:%d
++UnexpectedValueException: phar error: corrupted central directory entry, no magic signature in zip-based phar "%sbug69441.phar" in %sbug69441.php:%d
  Stack trace:
  #0 %s%ebug69441.php(%d): Phar->__construct('%s', 0)
  #1 {main}