]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAndrey Hristov <andrey@php.net>
Wed, 26 Jun 2013 14:50:08 +0000 (16:50 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 26 Jun 2013 14:50:08 +0000 (16:50 +0200)
commit781be5f1d74ea9406e9ab82f9f90844befcc67b3
tree943739a8f58bea60970a2f7877345c0a83fb9bd8
parent623386d79988d1aeea941bb463ece2c27f9ed5d0
parentb34e8d2e3e892d8844cf9af7c0ce4bf3ed698fc6
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS
ext/pgsql/pgsql.c