]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Wed, 12 Nov 2014 00:35:41 +0000 (16:35 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 12 Nov 2014 00:35:41 +0000 (16:35 -0800)
* PHP-5.6:
  fix loop - size_t is unsigned so can not be negative
  fix copypaste error

Conflicts:
ext/standard/html.c


Trivial merge