From: Stanislav Malyshev Date: Sun, 23 Nov 2014 22:54:58 +0000 (-0800) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~150^2~36 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1895d202b4b9f992640e194a515a208cbcc1cd10;p=php Merge branch 'PHP-5.6' * PHP-5.6: typo fixes - https://github.com/vlajos/misspell_fixer Conflicts: ext/ftp/ftp.h ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/standard/image.c --- 1895d202b4b9f992640e194a515a208cbcc1cd10