Merge branch 'master' of https://github.com/buildbotics/machine-controller
authorDoug Coffland <dougcoffland@gmail.com>
Tue, 8 Mar 2016 22:48:20 +0000 (14:48 -0800)
committerDoug Coffland <dougcoffland@gmail.com>
Tue, 8 Mar 2016 22:48:20 +0000 (14:48 -0800)

Trivial merge