]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDavid Soria Parra <dsp@php.net>
Tue, 17 Sep 2013 07:55:59 +0000 (09:55 +0200)
committerDavid Soria Parra <dsp@php.net>
Tue, 17 Sep 2013 07:55:59 +0000 (09:55 +0200)
* PHP-5.5:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses


Trivial merge