]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Tue, 3 Dec 2013 22:54:24 +0000 (14:54 -0800)
committerAdam Harvey <aharvey@php.net>
Tue, 3 Dec 2013 22:54:24 +0000 (14:54 -0800)
* PHP-5.6:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.


Trivial merge