From: Stanislav Malyshev <stas@php.net>
Date: Mon, 17 Jun 2013 07:42:36 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~430
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4342513228d7a486e17b90264ac92f37c423b29;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Tests: PDO Mysql - update for fixed getColumnMeta()
  fix bug #48724
---

a4342513228d7a486e17b90264ac92f37c423b29