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.

diff --cc NEWS
index 792aa2727ca53ecfd2680501e21dd83f2120336e,c0379f82b38b1e08e81da0a9af2321a6a06fae2c..88a7129739e3fa1c1b550c4623518ccd84c2e1c3
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -17,9 -15,9 +17,12 @@@ PH
    . Fixed bug #65196 (Passing DOMDocumentFragment to DOMDocument::saveHTML() 
      Produces invalid Markup). (Mike)
  
+ - Filter:
+   . Fixed bug #66229 (128.0.0.0/16 isn't reserved any longer). (Adam)
+ 
 +- Sockets:
 +  . Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined). (Felipe)
 +
  - XSL
    . Fixed bug #49634 (Segfault throwing an exception in a XSL registered
      function). (Mike)

diff --cc ext/filter/logical_filters.c
Simple merge