]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAdam Harvey <aharvey@php.net>
Tue, 3 Dec 2013 22:51:03 +0000 (14:51 -0800)
committerAdam Harvey <aharvey@php.net>
Tue, 3 Dec 2013 22:51:03 +0000 (14:51 -0800)
commit6f52f566f3d3a08418917baa6b659249a39c3f18
treec91baf7d7033200dfe25e80e1f17d6ddabbdd6bd
parentffbb56685ff316e89161a80911b71039e4544184
parentd1314893fd1325ca6aa0831101896e31135a2658
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
NEWS
ext/filter/logical_filters.c