Merge branch 'master' of https://github.com/buildbotics/machine-controller
authorDoug Coffland <dougcoffland@gmail.com>
Mon, 31 Aug 2015 23:10:56 +0000 (16:10 -0700)
committerDoug Coffland <dougcoffland@gmail.com>
Mon, 31 Aug 2015 23:10:56 +0000 (16:10 -0700)

Trivial merge