From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Thu, 19 Feb 2009 07:09:23 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~58
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=d0459e29cb1a6f6196e3e12ccc4da47601514d67;p=monkeysphere.git

Merge commit 'dkg/master'
---

d0459e29cb1a6f6196e3e12ccc4da47601514d67
diff --cc src/share/common
index 31f8ddd,b45363a..9630bf9
--- a/src/share/common
+++ b/src/share/common
@@@ -21,23 -21,8 +21,23 @@@ SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDI
  export SYSCONFIGDIR
  
  # monkeysphere version
- VERSION=__VERSION__
+ VERSION=0.23~pre
  
 +# default log level
 +LOG_LEVEL="INFO"
 +
 +# default keyserver
 +KEYSERVER="pool.sks-keyservers.net"
 +
 +# whether or not to check keyservers by defaul
 +CHECK_KEYSERVER="true"
 +
 +# default monkeysphere user
 +MONKEYSPHERE_USER="monkeysphere"
 +
 +# default about whether or not to prompt
 +PROMPT="true"
 +
  ########################################################################
  ### UTILITY FUNCTIONS