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

Merge branch 'PHP-5.6'

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

e700cbff22bac6df9585edef7fa6fd70abc69f76