Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Fri, 26 Oct 2012 12:22:31 +0000 (14:22 +0200)
committerJohannes Schlüter <johannes@php.net>
Fri, 26 Oct 2012 12:22:31 +0000 (14:22 +0200)
Conflicts:
ext/pdo_mysql/mysql_statement.c


Trivial merge