diff options
author | Michael Wallner <mike@php.net> | 2014-04-03 10:41:24 +0200 |
---|---|---|
committer | Michael Wallner <mike@php.net> | 2014-04-03 10:41:24 +0200 |
commit | 55005c86383f4616a2ca02333af9630f617a1a2e (patch) | |
tree | 6c9dfa69ce9c6c025cb0c0d18cee3d0b294f1b27 /ext/mysql/php_mysql.c | |
parent | 1c2bcec68a260502b72bda9eb8a1e9c3ef4ddafe (diff) | |
parent | 60ef357ffcc0335ff728cef498bfc9e06773fd3a (diff) | |
download | php-git-55005c86383f4616a2ca02333af9630f617a1a2e.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fix Bug #66736 fpassthru broken
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions