Merge commit 'dkg/master'

Conflicts:

	src/monkeysphere-server

Resolved conflicts in revoke-hostname, and finish work on them.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/common b/src/common
index 34c86cb..bb988f7 100644
--- a/src/common
+++ b/src/common
@@ -77,6 +77,12 @@ gpg_unescape() {
     sed 's/\\x3a/:/g'
 }
 
+# convert nasty chars into gpg-friendly form in pipeline
+# FIXME: escape everything, not just colons!
+gpg_escape() {
+    sed 's/:/\\x3a/g'
+}
+
 # remove all lines with specified string from specified file
 remove_line() {
     local file