diff options
| author | Matteo Beccati <mbeccati@php.net> | 2014-12-06 10:24:27 +0100 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2014-12-06 10:24:27 +0100 |
| commit | b120f9beb2a0d07c8c16d9e6cc5b1226bb863d31 (patch) | |
| tree | 7e38f875389865e1efea584ede8d4c0e6fcbd062 /sapi | |
| parent | 381fd62ccf9ee6889c964c2be6cf1712a9ac4562 (diff) | |
| parent | 625b929c6eb222773d175bd22a7b893165b960fd (diff) | |
| download | php-git-b120f9beb2a0d07c8c16d9e6cc5b1226bb863d31.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix compilation error (ref #68424)
Diffstat (limited to 'sapi')
0 files changed, 0 insertions, 0 deletions