]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0525dce 8e36d36)
Merge branch 'PHP-5.5' into PHP-5.6
authorFelipe Pena <felipensp@gmail.com>
Sun, 22 Dec 2013 11:43:10 +0000 (09:43 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sun, 22 Dec 2013 11:43:10 +0000 (09:43 -0200)
* PHP-5.5:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.