Merge branch 'master' of https://github.com/ipfs/go-ipfs into iss653

ipfs · May 6, 2015 · 88077f7 · 88077f7
2 parents 9517911 + b71b727
commit 88077f7
Show file tree

Hide file tree

Showing 14 changed files with 284 additions and 154 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/whyrusleeping/iptb/main.go b/Godeps/_workspace/src/github.com/whyrusleeping/iptb/main.go