]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorandrey <andrey@php.net>
Fri, 29 Jun 2012 09:43:14 +0000 (12:43 +0300)
committerandrey <andrey@php.net>
Fri, 29 Jun 2012 09:43:14 +0000 (12:43 +0300)
1  2 
ext/mysqlnd/mysqlnd_charset.c

Simple merge