Merge branch 'master' of github.com:didiercrunch/strider-hg

Conflicts:
	lib/index.js
	package.json
This commit is contained in:
didier.amyot committed 2014-01-20 10:27:45 -05:00
commit b05a293447
1 file changed
+2 -1
+2 -1
View File
@@ -24,4 +24,5 @@ describe('The lib util interface', function () {
})
})
})
})