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)
update config


Trivial merge