Merge branch 'master' of https://github.com/buildbotics/machine-controller
authorDoug Coffland <dougcoffland@gmail.com>
Thu, 6 Aug 2015 02:23:26 +0000 (19:23 -0700)
committerDoug Coffland <dougcoffland@gmail.com>
Thu, 6 Aug 2015 02:23:26 +0000 (19:23 -0700)

Trivial merge