diff options
| author | David Soria Parra <dsp@php.net> | 2013-09-17 09:55:03 +0200 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2013-09-17 09:55:03 +0200 |
| commit | 5e3da04fb033734d2e69542fe835660c0df8dc48 (patch) | |
| tree | 924072c22a4964f4ac68068277d8464aad394e01 /main/php_variables.c | |
| parent | 3d6ac70e6652c2c15b180e3f34fdc061e47f68a4 (diff) | |
| parent | dfd7d1063a5292b04f6134284337550f4f513749 (diff) | |
| download | php-git-5e3da04fb033734d2e69542fe835660c0df8dc48.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
Diffstat (limited to 'main/php_variables.c')
0 files changed, 0 insertions, 0 deletions