]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorKeyur Govande <keyur@php.net>
Mon, 28 Jul 2014 23:16:52 +0000 (23:16 +0000)
committerKeyur Govande <keyur@php.net>
Mon, 28 Jul 2014 23:16:52 +0000 (23:16 +0000)
* PHP-5.5:
  Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)


Trivial merge