Merge branch 'master' of https://github.com/buildbotics/machine-controller
authorDoug Coffland <dougcoffland@gmail.com>
Sun, 6 Sep 2015 19:24:22 +0000 (12:24 -0700)
committerDoug Coffland <dougcoffland@gmail.com>
Sun, 6 Sep 2015 19:24:22 +0000 (12:24 -0700)

Trivial merge