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)
commitc130785b600e2f27e873c6b6ec4eac062e14701f
treea826d17b206d4bad2092ec1f62ae212d91335e3c
parente39a656855be0ccc88fd0f90910eb90acd6e4a9f
parentda7b5981c5ae28504434c492d468913645111d66
Merge branch 'master' of git.php.net:/pecl/database/pq

* 'master' of git.php.net:/pecl/database/pq:
  better checks for json support
  prepare 0.5.2