]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 1 Apr 2015 21:06:32 +0000 (23:06 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 1 Apr 2015 21:06:32 +0000 (23:06 +0200)
* PHP-5.6:
  oop, put both the error number and message for both db object to the error message


Trivial merge