]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorXinchen Hui <laruence@php.net>
Sat, 14 Feb 2015 14:18:13 +0000 (22:18 +0800)
committerXinchen Hui <laruence@php.net>
Sat, 14 Feb 2015 14:18:13 +0000 (22:18 +0800)
commit1db720cd6d63f5feafb5c7ecc5fada35e2189cff
tree9bef2c709247afce99204bd553f588aaed335e46
parentd0be36cf5b5b92bd51e8e4c3e924411c93f95bd8
parent7667f8efc6ee9727cbd7af26e5f62f9cebd8a25e
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
ext/pgsql/pgsql.c
NEWS
ext/pgsql/pgsql.c