diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2014-08-13 20:15:52 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2014-08-13 20:15:52 +0800 |
| commit | c5f619ba6fd1182799e2e43dc60f008bd43da3dc (patch) | |
| tree | 5df1f7d46f6e02d6e05bba13ad3950c0f642dfa8 /ext/mysql/php_mysql.c | |
| parent | 934c35f58685cde2e0bc7e649486db7b488758e9 (diff) | |
| parent | f6896e4395e89ceeacd8f8a940cbafeeee3ac4a3 (diff) | |
| download | php-git-c5f619ba6fd1182799e2e43dc60f008bd43da3dc.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed #66091
Conflicts:
ext/date/php_date.c
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions