From: Michael Prokop <mika@grml.org>
Date: Tue, 22 Jan 2008 10:58:17 +0000 (+0100)
Subject: Merge branches
X-Git-Tag: 0.2~4^2
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=079ea71204d408f78886da20fe019dd631a3b2bc

Merge branches
---

079ea71204d408f78886da20fe019dd631a3b2bc
diff --cc grml-live
index 664c145,534b809..e35dcbf
--- a/grml-live
+++ b/grml-live
@@@ -4,10 -4,10 +4,10 @@@
  # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
  # Bug-Reports:   see http://grml.org/bugs/
  # License:       This file is licensed under the GPL v2 or any later version.
- # Latest change: Fre Jän 11 10:22:19 CET 2008 [mika]
 -# Latest change: Sun Jan 20 22:38:18 CET 2008 [mika]
++# Latest change: Die Jän 22 11:57:54 CET 2008 [mika]
  ################################################################################
  
 -# main initialization  setup, set some misc variables {{{
 +# read configuration files, set some misc variables {{{
  
  export LANG=C
  export LC_ALL=C
@@@ -189,7 -189,24 +189,6 @@@ f
  # }}}
  
  # command line parsing {{{
--
  while getopts "a:C:c:g:i:o:r:s:t:v:bFhuVz" opt; do
    case "$opt" in
      a) ARCH="$OPTARG" ;;