Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS 5.6
  NEWS 5.5
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  fix test output (32bits)

Conflicts:
	ext/pgsql/pgsql.c

diff --cc ext/pgsql/pgsql.c
index 6a86b8941bfbb6f4f7c7c119aee7c28959265683,a6263680af1e8f997c09b37234581c2bed8b1749..a65b7a0aa9f2b5eef17312528d16f738a0d5a8a8
--- 1/ext/pgsql/pgsql.c
--- 2/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@@ -6498,11 -6497,11 +6502,12 @@@ static int do_exec(smart_str *querystr
  
        return -1;
  }
 +/* }}} */
  
 -static inline void build_tablename(smart_str *querystr, PGconn *pg_link, const char *table)
 +static inline void build_tablename(smart_str *querystr, PGconn *pg_link, const char *table) /* {{{ */
  {
-       char *table_copy, *escaped, *token, *tmp;
+       char *table_copy, *escaped, *tmp;
+       const char *token;
        size_t len;
  
        /* schame.table should be "schame"."table" */