]> granicus.if.org Git - php/commit
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)
commit8f11f7f179c891a5966eec8f748d486f73ef8fa1
tree41b087b0602cfad72344ba59e469fc6dca735226
parent48cc47d55aedce5b90ac1458f4c2c3f6240f3019
parent44697c115b3098db677e42e78c11a0cc9e0e0019
Merge branch 'PHP-5.6'

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