]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Sun, 25 Mar 2012 08:03:25 +0000 (01:03 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 25 Mar 2012 08:03:25 +0000 (01:03 -0700)
* PHP-5.3:
  fix bug #61487 - bad bounds check in grapheme_strpos


Trivial merge