summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/php_functions.c
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-12-12 14:18:43 +0100
committerJulien Pauli <jpauli@php.net>2014-12-12 14:18:43 +0100
commit895b4efab0d27b658d384a391ba6d34bb35b32bd (patch)
tree5cf00459a009e1bf96ac84a810e7f24af4c2ae3c /sapi/apache2handler/php_functions.c
parentb1709b8ff0ad3a4beb1b560301d886aa49946599 (diff)
parentfbe9b2c088b7fe75cda6668448841ae1e1fcf59b (diff)
downloadphp-git-895b4efab0d27b658d384a391ba6d34bb35b32bd.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Updated NEWS
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions