merge with preference for npm 1 2 30

author Steve Hackbarth <stephenhackbarth@gmail.com>

Wed, 13 Aug 2014 17:58:21 +0000 (13:58 -0400)

committer Steve Hackbarth <stephenhackbarth@gmail.com>

Wed, 13 Aug 2014 17:58:21 +0000 (13:58 -0400)
author Steve Hackbarth <stephenhackbarth@gmail.com>
Wed, 13 Aug 2014 17:58:21 +0000 (13:58 -0400)
committer Steve Hackbarth <stephenhackbarth@gmail.com>
Wed, 13 Aug 2014 17:58:21 +0000 (13:58 -0400)
diff --cc node-datasource/main.js
Simple merge
diff --cc package.json
Simple merge
author	Steve Hackbarth <stephenhackbarth@gmail.com>
	Wed, 13 Aug 2014 17:58:21 +0000 (13:58 -0400)
committer	Steve Hackbarth <stephenhackbarth@gmail.com>
	Wed, 13 Aug 2014 17:58:21 +0000 (13:58 -0400)
		1	2
node-datasource/main.js	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history