Merge branch 'master' of github.com:buildbotics/machine-controller
authorJoseph Coffland <joseph@cauldrondevelopment.com>
Wed, 5 Aug 2015 22:44:36 +0000 (15:44 -0700)
committerJoseph Coffland <joseph@cauldrondevelopment.com>
Wed, 5 Aug 2015 22:44:36 +0000 (15:44 -0700)

Trivial merge