Merge pull request #392 from wolfmanjm/upstreamedge
authorJim Morris <morris@wolfman.com>
Sun, 4 May 2014 03:11:42 +0000 (20:11 -0700)
committerJim Morris <morris@wolfman.com>
Sun, 4 May 2014 03:11:42 +0000 (20:11 -0700)
commitfac500b9633822a52ffbce1354507583f0e8af60
treef3c1c33d101ec1da6983ef6578e73e0141ceca30
parent34ba6387779f4e20af10ab7d3e4905a9e7ca17e8
parentea474939762de11b252c55ea36d5103f7f67903d
Merge pull request #392 from wolfmanjm/upstreamedge

update config