Merge branch 'edge' of github.com:Smoothieware/Smoothieware into edge
authorJim Morris <wolfmanjm@gmail.com>
Sat, 12 Jul 2014 03:38:54 +0000 (20:38 -0700)
committerJim Morris <wolfmanjm@gmail.com>
Sat, 12 Jul 2014 03:38:54 +0000 (20:38 -0700)
commit390d78e4b2dac35ef680117821d0a66224767be6
treec1641736e453557addbfc0c312b056dd165a6f78
parente4e704371312ef0afb5a93782ad5052749ac1a98
parent315e23dcdf51d9d8691aca5da2b5e5339ec0eae2
Merge branch 'edge' of github.com:Smoothieware/Smoothieware into edge