[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/filter/logical_filters.c

[David Soria Parra]

Commit:    5e3da04fb033734d2e69542fe835660c0df8dc48
Author:    David Soria Parra <d...@php.net>         Tue, 17 Sep 2013 09:55:03 
+0200
Parents:   3d6ac70e6652c2c15b180e3f34fdc061e47f68a4 
dfd7d1063a5292b04f6134284337550f4f513749
Branches:  PHP-5.5

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=5e3da04fb033734d2e69542fe835660c0df8dc48

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses

Changed paths:
  MM  ext/filter/logical_filters.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php