Merge branch 'master' of github.com:jbenet/go-ipfs

ab9baf91 · Jeromy · 854ae2c5 · 8281b4a8 · ab9baf91
--- a/doc.go
+++ b/doc.go
+// IPFS is a global, versioned, peer-to-peer filesystem
+package ipfs