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)
commit7a39709ec854fd4eef3952bd4982b903b3ff68ef
tree6814f71efd991b424d890afe8a6c7f17f8d9a261
parentf70166495855a42027cc275bdd7b325b60780420
parent1e6e89eebe77456dedc82a3ff87f86812db261c0
Merge pull request #322 from wolfmanjm/upstreamedge

fix M26 and M23