diff options
| author | Adam Harvey <aharvey@php.net> | 2014-12-05 13:57:46 -0800 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-12-05 13:57:46 -0800 |
| commit | 79131b46176d136743274f802cfc87418c4294db (patch) | |
| tree | 005b4ce5bfe5523e7ed324246087836da6a37eba | |
| parent | 3add3491b3c0d48aa5278163664e5dc66c024419 (diff) | |
| parent | 0e985d372692e13b9b777b5eae5572e028f1d96a (diff) | |
| download | php-git-79131b46176d136743274f802cfc87418c4294db.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Revert unintentional docblock change
| -rw-r--r-- | ext/curl/interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 43af68e817..41ce0568bb 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -10,7 +10,7 @@ | http://www.php.net/license/3_01.txt | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you 6 copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author: Sterling Hughes <sterling@php.net> | +----------------------------------------------------------------------+ |