diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-07-15 00:27:57 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-15 00:27:57 -0700 |
| commit | 0aadbf7578a89f1d8fcc1cc23d0751af9e6a739a (patch) | |
| tree | 0bf7be2ec53562e8ba40b3f29bc277850cd93bd8 /main/php_ini.c | |
| parent | f23a5fbc8e8a81db0f020a49c10aae0a100e2dbf (diff) | |
| parent | 2c73ce4363c209dc9e094c34be4cac22ba8d30e8 (diff) | |
| download | php-git-0aadbf7578a89f1d8fcc1cc23d0751af9e6a739a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
revert false fix
typo fixes
less serious compatAbility fixes
typos (orig)
Conflicts:
ext/mysql/php_mysql.c
Diffstat (limited to 'main/php_ini.c')
0 files changed, 0 insertions, 0 deletions