Merge pull request #647 from wolfmanjm/upstreamedge
authorJim Morris <morris@wolfman.com>
Tue, 24 Mar 2015 21:17:33 +0000 (14:17 -0700)
committerJim Morris <morris@wolfman.com>
Tue, 24 Mar 2015 21:17:33 +0000 (14:17 -0700)
Fix #646


Trivial merge