Merge pull request #322 from wolfmanjm/upstreamedge
authorJim Morris <morris@wolfman.com>
Tue, 28 Jan 2014 07:37:41 +0000 (23:37 -0800)
committerJim Morris <morris@wolfman.com>
Tue, 28 Jan 2014 07:37:41 +0000 (23:37 -0800)
fix M26 and M23


Trivial merge