summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/php_functions.c
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2014-08-21 22:44:34 +0200
committerMichael Wallner <mike@php.net>2014-08-21 22:45:33 +0200
commit3b82c4e52063e74abaca637811629b521754de3d (patch)
tree784e1184fe42e06f797192ff8de0b8a5deacdd1e /sapi/apache2handler/php_functions.c
parent76c2a9f4f47495f3db95a2f930f5b604ac105aa3 (diff)
parentc4fb183b9fd6fecf7dfb8df309bfa34ff1ec2e53 (diff)
downloadphp-git-3b82c4e52063e74abaca637811629b521754de3d.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: fix bug #67865 updated NEWS to fit last release NEWS Fix bug #67878 program_prefix not honoured in man pages
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions