]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorandrey <andrey@php.net>
Wed, 16 May 2012 13:59:39 +0000 (15:59 +0200)
committerandrey <andrey@php.net>
Wed, 16 May 2012 13:59:39 +0000 (15:59 +0200)
commit4d2d8e871771be0342869e6710ef4e74346db1e7
tree37fcf7af24032ce6e36840bb08866fe4b83e9534
parent1abcd81872978026d269532c2f5f1e0f35dcb729
parentd4afbd487abbe9e5f3e4fc6c44974639e123406a
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
ext/mysqlnd/mysqlnd_ps.c

merge fix for bug#62046
ext/mysqlnd/mysqlnd_ps.c