From: David Soria Parra <dsp@php.net>
Date: Wed, 18 Sep 2013 12:28:57 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.4~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2eb566188625162644a186bcb6757f22978c54f9;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  RFC 6598 reserved ip range starts at 100.64.0.0
---

2eb566188625162644a186bcb6757f22978c54f9