From: Christoph M. Becker <cmb@php.net>
Date: Tue, 23 Jun 2015 22:32:13 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.11RC1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=905c5f4858be48c1478debb07e91516aa916260f;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #69768 (escapeshell*() doesn't cater to !)
  bump API version to 6.8
---

905c5f4858be48c1478debb07e91516aa916260f