diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2015-02-11 22:41:52 +0200 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2015-02-11 22:41:52 +0200 |
| commit | ee9a89911445ec2824019109a0142b0b46a1424b (patch) | |
| tree | 64c461e5557ff9921cb14beadaee25146749410a /sapi/phpdbg/phpdbg_utils.c | |
| parent | 047803268c053c55086a23c334c349e8c9c842ec (diff) | |
| parent | c741faf4bb57cff872c412cbf1183cd33f13fbed (diff) | |
| download | php-git-ee9a89911445ec2824019109a0142b0b46a1424b.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Add missing NEWS entry for revert of bug #41631
Add CVE ID to bug #68676
Align email format for recent NEWS entries
Bug #55508 was fixed in 5.5.19 with 15ba757a, not in 5.5.18
Add missing NEWS entry for revert of bug #41631
Add missing NEWS entry for bug #68027
Align format for bug #68799
Bug #68361 was fixed in 5.5.20 using 327d4f9a, not in 5.5.19
Bug #55618 was fixed in 5.5.21 using eaf107c0
Add security bugs fixed in 5.5.18
Add CVE ID to bug #68676
Align email format for recent NEWS entries
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.c')
0 files changed, 0 insertions, 0 deletions