diff options
author | Hannes Magnusson <bjori@php.net> | 2012-03-24 17:59:52 +0100 |
---|---|---|
committer | Hannes Magnusson <bjori@php.net> | 2012-03-24 17:59:52 +0100 |
commit | 10809686f0dbcbbf0eb06c968d65e0febe1dc034 (patch) | |
tree | 01d7fcd9f023b4cf2cd03823ac3828cc837350dc /ext/pdo_mysql/mysql_statement.c | |
parent | 7a1c76538541e74719faf2311d72a70acd3c01e4 (diff) | |
parent | 948d326b294becccf1e1a34851bce380f2381b96 (diff) | |
download | php-git-10809686f0dbcbbf0eb06c968d65e0febe1dc034.tar.gz |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix test on FreeBSD and other systems that have /etc/services
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
0 files changed, 0 insertions, 0 deletions