From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 22 Dec 2013 11:42:58 +0000 (-0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.8RC1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e36d36ee6dc89701416c282ede0bcd92fd3aa0e;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

8e36d36ee6dc89701416c282ede0bcd92fd3aa0e