diff options
author | David Soria Parra <davidsp@fb.com> | 2014-01-21 16:20:08 +0100 |
---|---|---|
committer | David Soria Parra <davidsp@fb.com> | 2014-01-21 16:20:08 +0100 |
commit | e9ae3cb9646bda3b543df95b942a9cd93dc36230 (patch) | |
tree | a8852e3c1719c2013219ea2c0279ecbee1ff3463 /sapi/phpdbg/phpdbg_info.c | |
parent | 5817111b639f82b71f92af3196cf7c4f158504e9 (diff) | |
parent | 69581cdbbbdfcf20edbbc7d787ef2efe0fdc3822 (diff) | |
download | php-git-e9ae3cb9646bda3b543df95b942a9cd93dc36230.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Change automaticaly to automatically
Diffstat (limited to 'sapi/phpdbg/phpdbg_info.c')
0 files changed, 0 insertions, 0 deletions