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

ipfs · May 14, 2015 · bd7c8f5 · bd7c8f5
2 parents 8e9a477 + 70dc7d9
commit bd7c8f5
Show file tree

Hide file tree

Showing 9 changed files with 523 additions and 4 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/sabhiram/go-git-ignore/.gitignore b/Godeps/_workspace/src/github.com/sabhiram/go-git-ignore/.gitignore
diff --git a/Godeps/_workspace/src/github.com/sabhiram/go-git-ignore/.travis.yml b/Godeps/_workspace/src/github.com/sabhiram/go-git-ignore/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/sabhiram/go-git-ignore/LICENSE b/Godeps/_workspace/src/github.com/sabhiram/go-git-ignore/LICENSE
diff --git a/Godeps/_workspace/src/github.com/sabhiram/go-git-ignore/README.md b/Godeps/_workspace/src/github.com/sabhiram/go-git-ignore/README.md
diff --git a/Godeps/_workspace/src/github.com/sabhiram/go-git-ignore/ignore.go b/Godeps/_workspace/src/github.com/sabhiram/go-git-ignore/ignore.go