From: Yasuo Ohgaki <yohgaki@php.net>
Date: Sat, 15 Feb 2014 09:30:11 +0000 (+0900)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ff9089aeb3145cdaed59668855d135e6fe0ea02;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

5ff9089aeb3145cdaed59668855d135e6fe0ea02
diff --cc ext/pgsql/pgsql.c
index 95cb8f6cfc,a39b4e6ecb..6e64cd29fb
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@@ -15,11 -15,11 +15,11 @@@
     | Authors: Zeev Suraski <zeev@zend.com>                                |
     |          Jouni Ahto <jouni.ahto@exdec.fi>                            |
     |          Yasuo Ohgaki <yohgaki@php.net>                              |
-    |          Youichi Iwakiri <yiwakiri@st.rim.or.jp> (pg_copy_*)         | 
-    |          Chris Kings-Lynne <chriskl@php.net> (v3 protocol)           | 
+    |          Youichi Iwakiri <yiwakiri@st.rim.or.jp> (pg_copy_*)         |
+    |          Chris Kings-Lynne <chriskl@php.net> (v3 protocol)           |
     +----------------------------------------------------------------------+
   */
 - 
 +
  /* $Id$ */
  
  #include <stdlib.h>