Merge remote-tracking branch 'upstream/0.4.0' into 0.4.0

Conflicts: Makefile
sguzwf · May 24, 2015 · 259ac91 · 259ac91
2 parents 14f0ffb + 35d6046
commit 259ac91
Show file tree

Hide file tree

Showing 598 changed files with 259,201 additions and 99 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/Readme b/Godeps/Readme
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore