summaryrefslogtreecommitdiff
path: root/main/php_variables.c
diff options
context:
space:
mode:
authorDavid Soria Parra <dsp@php.net>2013-09-18 14:28:57 +0200
committerDavid Soria Parra <dsp@php.net>2013-09-18 14:28:57 +0200
commit2eb566188625162644a186bcb6757f22978c54f9 (patch)
treea665a41634cce9e90ca0e8968891d98ac5cb7ea6 /main/php_variables.c
parenta34b141e08f02c34a100676080dddf7d9be84544 (diff)
parent7e9044b6a251f40da1217c3265b83a9caae8bff8 (diff)
downloadphp-git-2eb566188625162644a186bcb6757f22978c54f9.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: RFC 6598 reserved ip range starts at 100.64.0.0
Diffstat (limited to 'main/php_variables.c')
0 files changed, 0 insertions, 0 deletions