• Merge branch 'master' of https://github.com/Eeems/webtorrent

    @Eeems
    Eeems committed May 14, 2014
    Loading status checks…
     
    Conflicts:
	bin/cmd.js
	index.js
	lib/torrent-manager.js
	lib/torrent.js
    0c96010