]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorFelipe Pena <felipensp@gmail.com>
Mon, 24 Jun 2013 17:48:28 +0000 (14:48 -0300)
committerFelipe Pena <felipensp@gmail.com>
Mon, 24 Jun 2013 17:48:28 +0000 (14:48 -0300)
* PHP-5.5:
  - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch


Trivial merge