diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2014-10-14 23:00:17 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2014-10-14 23:00:17 +0800 |
| commit | 1f4f2ef403e8b8df206bf337cc475483b4ba0a2f (patch) | |
| tree | 92be14f8c86dad508744cc147c6c5092cd6082ec /ext/mysqlnd/php_mysqlnd.c | |
| parent | d2daa19701bdf0ac72bb6c23d868949185ca6723 (diff) | |
| parent | fb35d7c56ec32ca43bcdb3e151bf1766b52984fe (diff) | |
| download | php-git-1f4f2ef403e8b8df206bf337cc475483b4ba0a2f.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68128
Conflicts:
ext/spl/spl_iterators.c
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions