Fixed ZTS build
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed ZTS build
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed ZTS build
Merge remote-tracking branch 'origin/master' into str_size_and_int64
More refactoring of the big function generating execute requests
Merge branch 'master' of git.php.net:php-src
Dont ignore errors from FT_Get_Glyph
Made pg_version() return full connection info.
Merge branch 'PHP-5.6'

* PHP-5.6:
  Made pg_version() return full connection info.
Merge branch 'str_size_and_int64' of git.php.net:php-src into str_size_and_int64
Merge remote-tracking branch 'origin/master' into str_size_and_int64

Conflicts:
	ext/mysqlnd/mysqlnd_ps_codec.c
after merge fix
more fixes after merge
fix uninitialized value
Merge remote-tracking branch 'origin/master' into str_size_and_int64

Conflicts:
	ext/mysqlnd/mysqlnd_ps_codec.c