diff options
author | Remi Collet <remi@php.net> | 2014-03-12 14:08:09 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2014-03-12 14:08:09 +0100 |
commit | a912fb498ec9a7b0310c5f1f006228b7d075917b (patch) | |
tree | 48161cb0d52330117a8e469ad0b1e1a732e30081 /ext/mysql/php_mysql.c | |
parent | 081e2b99285b362dd036443f244ce8192603b2a4 (diff) | |
parent | 68f318a422f7149a4e73915f13127fb704c8c67f (diff) | |
download | php-git-a912fb498ec9a7b0310c5f1f006228b7d075917b.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
typo in NEWS
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions