]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorRasmus Lerdorf <rasmus@php.net>
Thu, 6 Nov 2014 17:49:11 +0000 (09:49 -0800)
committerRasmus Lerdorf <rasmus@php.net>
Thu, 6 Nov 2014 17:49:11 +0000 (09:49 -0800)
* 'PHP-5.5' of git.php.net:php-src:
  Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)


Trivial merge