]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAndrey Hristov <andrey@php.net>
Wed, 9 Jan 2013 17:30:56 +0000 (18:30 +0100)
committerAndrey Hristov <andrey@php.net>
Wed, 9 Jan 2013 17:30:56 +0000 (18:30 +0100)
commitcb6071ef54779e392cf50831399dfd66939de9a0
tree27c4b60d37a848b674c734403a324ff6fe9adade
parentddcb67d446ba7a0637fdf3a52bdaaaa99ee80755
parent6a6ec195acb0a67b8728dd32fad5c82b37b31192
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
ext/mysqlnd/mysqlnd.c
ext/mysqlnd/mysqlnd.c