Merge branch 'PHP-5.4' into PHP-5.5
authorDavid Soria Parra <dsp@php.net>
Wed, 18 Sep 2013 12:28:57 +0000 (14:28 +0200)
committerDavid Soria Parra <dsp@php.net>
Wed, 18 Sep 2013 12:28:57 +0000 (14:28 +0200)
commit2eb566188625162644a186bcb6757f22978c54f9
treea665a41634cce9e90ca0e8968891d98ac5cb7ea6
parenta34b141e08f02c34a100676080dddf7d9be84544
parent7e9044b6a251f40da1217c3265b83a9caae8bff8
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  RFC 6598 reserved ip range starts at 100.64.0.0
ext/filter/logical_filters.c