diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2012-12-05 13:37:40 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2012-12-05 13:37:40 +0400 |
| commit | 26c165cc03267969ac313f2fd9a1fcb48435215d (patch) | |
| tree | 46b11ed346fdd381914c9043d16681f1f5fd4d0b /ext/mysql/php_mysql.c | |
| parent | fa30e4754bea0d0c6a048ca029c543ddcaf3b84f (diff) | |
| parent | 7d7ff76659ddb679108f3cc6016a825c93a6605d (diff) | |
| download | php-git-26c165cc03267969ac313f2fd9a1fcb48435215d.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
Two tests deactivated until #63688 was fixed
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions