Merge pull request #1081 from wolfmanjm/upstreamedge
authorJim Morris <morris@wolfman.com>
Mon, 26 Dec 2016 21:54:57 +0000 (13:54 -0800)
committerGitHub <noreply@github.com>
Mon, 26 Dec 2016 21:54:57 +0000 (13:54 -0800)
update configs


Trivial merge