]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
authorChristopher Jones <sixd@php.net>
Mon, 19 Aug 2013 17:53:41 +0000 (10:53 -0700)
committerChristopher Jones <sixd@php.net>
Mon, 19 Aug 2013 17:53:41 +0000 (10:53 -0700)
* 'PHP-5.3' of https://git.php.net/repository/php-src:
  fix using wrong buffer pointer


Trivial merge