Merge branch 'edge' of github.com:arthurwolf/Smoothie into edge
authorArthur Wolf <wolf.arthur@gmail.com>
Sun, 22 Apr 2012 07:26:53 +0000 (09:26 +0200)
committerArthur Wolf <wolf.arthur@gmail.com>
Sun, 22 Apr 2012 07:26:53 +0000 (09:26 +0200)
commit94fa6929d126b41181e4659db7631fc705a2edcc
tree1240f3ff112daf1e5f09901869bfcfad1090c7d2
parentbee725fcd5dce2162f643dd747fb95c1cc9f4242
parent673b73eea4d5c16cee5ccde4fcc6f80203f5fc77
Merge branch 'edge' of github.com:arthurwolf/Smoothie into edge

Conflicts:
src/modules/utils/currentcontrol/CurrentControl.cpp