]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Thu, 9 Oct 2014 00:24:58 +0000 (08:24 +0800)
committerTjerk Meesters <datibbaw@php.net>
Thu, 9 Oct 2014 00:24:58 +0000 (08:24 +0800)
* PHP-5.6:
  Updated NEWS for #68129
  Updated NEWS for #68129
  Fixed bug #68129

1  2 
ext/standard/url.c

Simple merge