diff options
| author | Derick Rethans <github@derickrethans.nl> | 2012-10-18 17:53:55 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2012-10-18 17:53:55 +0100 |
| commit | b58d45b67fed9d5ee7bb4206b7613435b180543d (patch) | |
| tree | 00def54ed047e9036a1a443ae72d125395d5ea22 /ext/mysql/php_mysql.c | |
| parent | 08a06597e69fce29de8ba2ab625dfd4242acd9ea (diff) | |
| parent | 7aed21c55753d2cfb5dc66e47b1a7396333e566f (diff) | |
| download | php-git-b58d45b67fed9d5ee7bb4206b7613435b180543d.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
Zend/acinclude.m4
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions