diff options
| author | Adam Harvey <aharvey@php.net> | 2013-12-03 14:51:03 -0800 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-12-03 14:51:03 -0800 |
| commit | 6f52f566f3d3a08418917baa6b659249a39c3f18 (patch) | |
| tree | c91baf7d7033200dfe25e80e1f17d6ddabbdd6bd /sapi/tux/php_tux.c | |
| parent | ffbb56685ff316e89161a80911b71039e4544184 (diff) | |
| parent | d1314893fd1325ca6aa0831101896e31135a2658 (diff) | |
| download | php-git-6f52f566f3d3a08418917baa6b659249a39c3f18.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
Diffstat (limited to 'sapi/tux/php_tux.c')
0 files changed, 0 insertions, 0 deletions