Merge branch 'PHP-5.5' into PHP-5.6

diff --cc ext/pgsql/pgsql.c
index 95cb8f6cfc0db84df837d31a22ded1d9989f9a21,a39b4e6ecb61f9ffc60194b062730b070d40d818..6e64cd29fb93d2a471c30c56095bf3fbc7a5c5cc
--- 1/ext/pgsql/pgsql.c
--- 2/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>

diff --cc ext/pgsql/php_pgsql.h
Simple merge