summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-01-20 13:27:51 -0800
committerStanislav Malyshev <stas@php.net>2015-01-20 13:27:51 -0800
commit73a5958e67dadfdded866fc796556bd0c37360d2 (patch)
tree8c260b4a81cabb2207fa04dba3472e235798b055 /ext/mysql/php_mysql.c
parentb2a254fe2d02ca4c3706223c962c55df2dc3adec (diff)
parentcca3c8a9852db83d2acd16810fe2b426aa047752 (diff)
downloadphp-git-73a5958e67dadfdded866fc796556bd0c37360d2.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: fix year
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions