]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorMateusz Kocielski <shm@php.net>
Tue, 18 Mar 2014 09:03:06 +0000 (10:03 +0100)
committerMateusz Kocielski <shm@php.net>
Tue, 18 Mar 2014 09:03:06 +0000 (10:03 +0100)
commit1a5c51829a36ac66a5abd4d68094dc448a07f856
tree3b5315ce0adbb5ddb73e7133026ceb70d0ed940f
parent789b10ccb5d0dd25d1801ce1a18528d9937e1326
parent888f467d63ba6d35d3d2142747b04870e94824a3
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix phpdbg build on FreeBSD
  Fixed off-by-one in php_url_parse_ex