Merge branch 'master' of git.php.net:/pecl/database/pq
authorRemi Collet <remi@php.net>
Fri, 17 Oct 2014 07:16:49 +0000 (09:16 +0200)
committerRemi Collet <remi@php.net>
Fri, 17 Oct 2014 07:16:49 +0000 (09:16 +0200)
* 'master' of git.php.net:/pecl/database/pq:
  better checks for json support
  prepare 0.5.2


Trivial merge