Merge pull request #532 from wolfmanjm/upstreamedge
authorJim Morris <morris@wolfman.com>
Fri, 10 Oct 2014 20:12:17 +0000 (13:12 -0700)
committerJim Morris <morris@wolfman.com>
Fri, 10 Oct 2014 20:12:17 +0000 (13:12 -0700)
fix ls


Trivial merge