Merge pull request #421 from wolfmanjm/upstreamedge
authorJim Morris <morris@wolfman.com>
Fri, 13 Jun 2014 22:04:54 +0000 (15:04 -0700)
committerJim Morris <morris@wolfman.com>
Fri, 13 Jun 2014 22:04:54 +0000 (15:04 -0700)
cleanup modules cleaning up


Trivial merge