]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAdam Harvey <aharvey@php.net>
Tue, 3 Dec 2013 22:52:35 +0000 (14:52 -0800)
committerAdam Harvey <aharvey@php.net>
Tue, 3 Dec 2013 22:52:35 +0000 (14:52 -0800)
commit44697c115b3098db677e42e78c11a0cc9e0e0019
tree1e262e90047a91e6c81043f51efedc92a1e25bdf
parent00c74ccf69ff5f4765c7a66bcf320bfad0cbbad5
parent6f52f566f3d3a08418917baa6b659249a39c3f18
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.