diff options
| author | Michael Wallner <mike@php.net> | 2015-03-30 13:48:57 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2015-03-30 13:48:57 +0200 |
| commit | 3a660bf3a5a73c10e05eccfcdf26d978f585f0af (patch) | |
| tree | 1f3980161063acf14bd270d50236229ed5a01b35 | |
| parent | ef52e44053df40fb79bf5c2514252550fce7f04e (diff) | |
| parent | f4264ebc6499b82f892cefb54c0e4a0e9642e1d9 (diff) | |
| download | php-git-3a660bf3a5a73c10e05eccfcdf26d978f585f0af.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug 64343
; Lesson learned: do not rebase on a merge commit
0 files changed, 0 insertions, 0 deletions