]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e3af09 a056113)
Merge branch 'PHP-5.4' into PHP-5.5
authorFelipe Pena <felipensp@gmail.com>
Sun, 22 Dec 2013 11:42:58 +0000 (09:42 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sun, 22 Dec 2013 11:42:58 +0000 (09:42 -0200)
* PHP-5.4:
  - 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.