From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 17 Apr 2013 11:44:53 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
X-Git-Tag: v1.3.56~36
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=12de2acc1bb1bf2b96f1855ced81fccf4650bdb8;hp=2de1ea231bd0c0c1147eb845fd9bdfd94b3974fe;p=metaproxy-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
---

diff --git a/rpm/metaproxy.sysconfig b/rpm/metaproxy.sysconfig
index 7ea2230..9c7f621 100644
--- a/rpm/metaproxy.sysconfig
+++ b/rpm/metaproxy.sysconfig
@@ -1,4 +1,4 @@
 # Defaults for metaproxy
 OPTIONS="-u $SERVER_USER -l /var/log/metaproxy.log -c /etc/metaproxy/metaproxy.xml"
-# The following options should noe be set, because since init.d script
+# The following options should not be set, because init.d script 
 # already sets them: -p, -D, -t