]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d6ac70 dfd7d10)
Merge branch 'PHP-5.4' into PHP-5.5
authorDavid Soria Parra <dsp@php.net>
Tue, 17 Sep 2013 07:55:03 +0000 (09:55 +0200)
committerDavid Soria Parra <dsp@php.net>
Tue, 17 Sep 2013 07:55:03 +0000 (09:55 +0200)
* PHP-5.4:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses

1  2 
ext/filter/logical_filters.c patch | diff1 | diff2 | blob | history

diff --cc ext/filter/logical_filters.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.