]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 23 Nov 2014 22:54:58 +0000 (14:54 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 23 Nov 2014 22:54:58 +0000 (14:54 -0800)
commit1895d202b4b9f992640e194a515a208cbcc1cd10
tree9ebcbc2030b120df99450a30550bbdacdebabec4
parent06fdf359e3217f795fded77e337d5417426b8d64
parent4dc994571d2def413a83a607885f3e809b60019d
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