]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorAdam Harvey <aharvey@php.net>
Sun, 22 Sep 2013 23:54:12 +0000 (16:54 -0700)
committerAdam Harvey <aharvey@php.net>
Sun, 22 Sep 2013 23:54:12 +0000 (16:54 -0700)
* PHP-5.5:
  Copy dba_*() keys before converting to string.


Trivial merge