]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFelipe Pena <felipensp@gmail.com>
Sun, 22 Dec 2013 11:43:29 +0000 (09:43 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sun, 22 Dec 2013 11:43:29 +0000 (09:43 -0200)
* PHP-5.6:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com


Trivial merge