diff options
| author | Nikita Popov <nikic@php.net> | 2012-06-19 18:41:49 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-06-19 18:41:49 +0200 |
| commit | 02cda8fd9450f5ffa6b630d652357e8de0500bdf (patch) | |
| tree | 9ea4d58ec1961071d38ce423b991e04c7a479d51 /ext/mysqlnd/php_mysqlnd.c | |
| parent | cce4764f138bd303e9fdf69d3dcc3d0cb377ead6 (diff) | |
| parent | 5d81fe6f12eaa35a9dd9b968bd778ce24d50fffa (diff) | |
| download | php-git-02cda8fd9450f5ffa6b630d652357e8de0500bdf.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
I messed up the last merge somehow :/ Merge again.
* PHP-5.3:
Add NEWS for bug #62262
Fixed bug RecursiveArrayIterator does not implement Countable
Conflicts:
ext/spl/spl_array.c
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions