diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-09-26 15:36:11 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-09-26 15:36:11 +0200 |
| commit | fc2a392a028be45fda2be18326ffacfc525ac6d9 (patch) | |
| tree | 8c6e079458d9718470717f291308aa6201382d7f /grub.mdwn | |
| parent | 2c18eac2140a577090c84854905728ebd2ce0fac (diff) | |
| parent | c6ecdd55fc994003a3cabf9fd3adf512908a7d28 (diff) | |
Merge commit 'c6ecdd55fc994003a3cabf9fd3adf512908a7d28'
Conflicts:
hurd/translator/procfs/jkoenig/discussion.mdwn
Diffstat (limited to 'grub.mdwn')
0 files changed, 0 insertions, 0 deletions