From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 22 Dec 2013 11:43:10 +0000 (-0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~103^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f1075bb29a2d27c67c2b74141e59bbfc259ae28;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
---

9f1075bb29a2d27c67c2b74141e59bbfc259ae28