Merge branch 'PHP-5.5' into PHP-5.6
authorChristoph M. Becker <cmb@php.net>
Tue, 23 Jun 2015 22:32:13 +0000 (00:32 +0200)
committerChristoph M. Becker <cmb@php.net>
Tue, 23 Jun 2015 22:32:13 +0000 (00:32 +0200)
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #69768 (escapeshell*() doesn't cater to !)
  bump API version to 6.8


Trivial merge