Merge pull request #789 from wolfmanjm/upstreamedge
authorJim Morris <morris@wolfman.com>
Wed, 2 Dec 2015 01:22:29 +0000 (17:22 -0800)
committerJim Morris <morris@wolfman.com>
Wed, 2 Dec 2015 01:22:29 +0000 (17:22 -0800)
commit94bce2e89ecd8bcf9d42a2bd0abb1e6c405efd27
tree7b25e3545e82e3a8a747d48d6e85fe613e6bd131
parent8c63042753cb6a7e94fe86a780906a65cef71eb2
parent9dac87634413df9dffe0a5ec596c076edd8bd718
Merge pull request #789 from wolfmanjm/upstreamedge

more travis fixes