From 93bf37b94d3adbc6ff0121c764faca633d6d3e32 Mon Sep 17 00:00:00 2001
From: Mark Nadal <mark@accelsor.com>
Date: Tue, 26 Jan 2016 12:59:10 -0800
Subject: [PATCH] Merge branch 'master' into develop

# Conflicts:
#	README.md
#	gun.js
---
 lib/wsp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/wsp.js b/lib/wsp.js
index beaa9451..94673f9f 100644
--- a/lib/wsp.js
+++ b/lib/wsp.js
@@ -196,4 +196,4 @@
 			wsp(opt.server);
 		}
 	});
-}({}));
+}({}));
\ No newline at end of file