From 416782793730dd15858f6f6b8882092bed8a9d12 Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Mon, 10 Mar 2014 15:00:25 -0300
Subject: [PATCH] merge master changes

---
 browser/browserify.js    | 2 +-
 test/test.PeerManager.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/browserify.js b/browser/browserify.js
index a6e81dc..d1b627f 100644
--- a/browser/browserify.js
+++ b/browser/browserify.js
@@ -26,6 +26,7 @@ var modules = [
   'Block',
   'Bloom',
   'Buffers.monkey',
+  'Connection',
   'Deserialize',
   'Gruntfile',
   'Number.monkey',
@@ -65,7 +66,6 @@ b.require('./util/util');
 b.require('./util/EncodedData');
 b.require('./util/VersionedData');
 b.add('./browser/bignum_config.js');
-
 modules.forEach(function(m) {
    b.require('./' + m + '.js' ,{expose: './'+m} );
 });
diff --git a/test/test.PeerManager.js b/test/test.PeerManager.js
index 6ebfc2e..5f3aa7f 100644
--- a/test/test.PeerManager.js
+++ b/test/test.PeerManager.js
@@ -5,7 +5,7 @@ var bitcore = bitcore || require('../bitcore');
 
 var should = chai.should();
 
-var PeerManagerModule = bitcore.PeerManager || require('soop').load('PeerManager');
+var PeerManagerModule = bitcore.PeerManager || require('./PeerManager');
 
 var PeerManager;