From: Andre Noll <maan@congo.fml.local>
Date: Thu, 20 Mar 2008 10:35:39 +0000 (+0100)
Subject: Merge commit 'remotes/meins/master'
X-Git-Tag: v0.0.4~19
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=cbd7c2d1bf41d2c14ace21b75b2362e8b151f99b;hp=f446dc1416090076177df45a568e195aaa9a8d1b;p=dss.git

Merge commit 'remotes/meins/master'

Conflicts:

	dss.ggo
---

diff --git a/dss.ggo b/dss.ggo
index 57e9313..e91a4c5 100644
--- a/dss.ggo
+++ b/dss.ggo
@@ -41,7 +41,7 @@ flag off
 dependon="logfile"
 details="
 	Note that dss refuses to start in daemon mode if no logfile
-	was specified. This option makes sense only in conjunction
+	was specified. This option is mostly useful in conjuction
 	with the -R option described below.
 "