Commit:    781be5f1d74ea9406e9ab82f9f90844befcc67b3
Author:    Andrey Hristov <and...@php.net>         Wed, 26 Jun 2013 16:50:08 
+0200
Parents:   623386d79988d1aeea941bb463ece2c27f9ed5d0 
b34e8d2e3e892d8844cf9af7c0ce4bf3ed698fc6
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=781be5f1d74ea9406e9ab82f9f90844befcc67b3

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
        NEWS

Changed paths:
  MM  ext/pgsql/pgsql.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to