diff options
| author | Adam Harvey <aharvey@php.net> | 2014-12-05 13:58:19 -0800 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-12-05 13:58:19 -0800 |
| commit | 381fd62ccf9ee6889c964c2be6cf1712a9ac4562 (patch) | |
| tree | c348e592e9f42ceb2f91d79e00e86572577e7643 | |
| parent | 0e67973e9a2707f0010ac9a65020f62b5cb104fb (diff) | |
| parent | 79131b46176d136743274f802cfc87418c4294db (diff) | |
| download | php-git-381fd62ccf9ee6889c964c2be6cf1712a9ac4562.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 01926a23cb..f75a2ba5bc 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> | +----------------------------------------------------------------------+ |