]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAndrey Hristov <andrey@php.net>
Tue, 28 Jan 2014 13:24:45 +0000 (15:24 +0200)
committerAndrey Hristov <andrey@php.net>
Tue, 28 Jan 2014 13:24:45 +0000 (15:24 +0200)
1  2 
ext/mysqlnd/mysqlnd_enum_n_def.h

Simple merge