• Merge https://github.com/fisch0920/webtorrent

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