diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-06 10:01:47 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-06 10:01:47 -0700 |
| commit | db610ba050cdc44c3c0d7c1c9ce81a2a17f5d087 (patch) | |
| tree | fb184acbc7296598c2af31cbcd586afa495dd10d /sapi/apache2handler/config.m4 | |
| parent | ca0497bba2222c282c39048776a9f61052e67643 (diff) | |
| parent | 9b38673776fdd2501119acea04f9c5869a007cf1 (diff) | |
| download | php-git-db610ba050cdc44c3c0d7c1c9ce81a2a17f5d087.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
# By Christopher Jones (2) and Xinchen Hui (1)
# Via Xinchen Hui
* 'master' of https://git.php.net/repository/php-src:
Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
PHP 5.5.2 has already branched
Doh. PHP 5.5 NEWS needs own commit.
Diffstat (limited to 'sapi/apache2handler/config.m4')
0 files changed, 0 insertions, 0 deletions