]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorAndrey Hristov <andrey@php.net>
Fri, 19 Apr 2013 13:55:46 +0000 (15:55 +0200)
committerAndrey Hristov <andrey@php.net>
Fri, 19 Apr 2013 13:55:46 +0000 (15:55 +0200)
1  2 
ext/mysqlnd/mysqlnd_enum_n_def.h

Simple merge