]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/656' into PHP-5.5
authorJulien Pauli <jpauli@php.net>
Sat, 29 Nov 2014 10:38:57 +0000 (11:38 +0100)
committerJulien Pauli <jpauli@php.net>
Sat, 29 Nov 2014 10:38:57 +0000 (11:38 +0100)
* pull-request/656:
  PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1

1  2 
ext/pdo/pdo_stmt.c

Simple merge