diff options
| author | David Soria Parra <dsp@php.net> | 2013-09-18 15:06:51 +0200 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2013-09-18 15:06:51 +0200 |
| commit | 94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf (patch) | |
| tree | 346f8b0ce00a53ab2f52c132d2e081f38efa6a56 /sapi/cli/php_cli_server.c | |
| parent | 2eb566188625162644a186bcb6757f22978c54f9 (diff) | |
| parent | 7a24ee13ec74bf3e85970e59dd69db8034ff434c (diff) | |
| download | php-git-94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Revert "EmptyIterator now implements Countable; fixes bug 60577"
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions