From: Felipe Pena <felipensp@gmail.com>
Date: Mon, 24 Jun 2013 17:47:40 +0000 (-0300)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b41959f9e14edf720631f287b7ac2d7c935d45f;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
---

4b41959f9e14edf720631f287b7ac2d7c935d45f