From: Michael Prokop <devnull@localhost>
Date: Sun, 18 Nov 2007 21:23:45 +0000 (+0100)
Subject: Merge branches
X-Git-Tag: 0.0.9
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=refs%2Ftags%2F0.0.9;hp=d3a4c57b0c95f6b2f3df77587942daa2df9f26b5;p=grml-live.git

Merge branches
---

diff --git a/templates/boot/isolinux/f3 b/templates/boot/isolinux/f3
index 2cf09e0..df5c2b2 100644
--- a/templates/boot/isolinux/f3
+++ b/templates/boot/isolinux/f3
@@ -15,7 +15,7 @@
  grub                                   start GRand Unified Bootloader (GRUB)  
  dos                                                        start FreeDOS 1.0  
  qemu                               boot with special options for use in Qemu  
- vmware                            boot with special options for use in VMware 
+ vmware                           boot with special options for use in VMware  
                                                                                
  A list with all supported boot options can be found at the CD at              
  /cdrom/GRML/grml-cheatcodes.txt