diff options
author | Anatol Belski <ab@php.net> | 2014-12-06 12:31:55 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-12-06 12:31:55 +0100 |
commit | 0854fd8b8114faa5bc4fa1736292525a5ecdea8b (patch) | |
tree | 6b0c74078098dc64da0326c2013200d53670446d /sapi/apache2handler/php_functions.c | |
parent | 08241ee3f3624d9fa9be21739a5e5cde28c24d0a (diff) | |
parent | 5d126245a3bb71b167a3b02a9d874c9247b556ff (diff) | |
download | php-git-0854fd8b8114faa5bc4fa1736292525a5ecdea8b.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed test
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions