]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorMateusz Kocielski <shm@php.net>
Tue, 18 Mar 2014 07:57:30 +0000 (08:57 +0100)
committerMateusz Kocielski <shm@php.net>
Tue, 18 Mar 2014 07:57:30 +0000 (08:57 +0100)
* PHP-5.4:
  Fixed off-by-one in php_url_parse_ex


Trivial merge