David Calavera 88f746d118 Merge pull request #17619 from jfrazelle/canonical-update ...

rebased canonical/json off go 1.5.1
Upstream-commit: b95048758a06097469901590e68f40bafb5d1762
Component: engine

2015-11-02 11:42:26 -08:00

..

github.com

Merge pull request #17619 from jfrazelle/canonical-update

2015-11-02 11:42:26 -08:00

golang.org/x/net

Keep license files

2015-07-23 16:12:21 -07:00

gopkg.in/fsnotify.v1

vendor fsnotify

2015-07-20 22:47:03 -04:00