| commit | 80001b1d2acc06b33bb6de05474ce54682dacfb6 | |
| author | H. Peter Anvin <hpa@zytor.com> | |
| Wed, 28 May 2008 16:23:57 +0000 (28 09:23 -0700) | ||
| committer | H. Peter Anvin <hpa@zytor.com> | |
| Wed, 28 May 2008 16:23:57 +0000 (28 09:23 -0700) | ||
| tree | a320dc9767a953d435ef9d3c951ebd2d97acf4dd | treesnapshot (tar.gz zip) |
| parent | 6699cb66d4456f2d61b3ac3f8d14ce81df2437eb | commitdiff |
| parent | 1bd7c31844a7b946c5d2d85a21e913fa81460930 | commitdiff |
Merge commit 'origin/master' into gpxe-added
Conflicts:
NEWS
version
Conflicts:
NEWS
version