Merge branch 'master' of ssh://uglyman.kremlin.cc:/var/www/htdocs/git/bbb-usb
authorkremlin <ian@kremlin.cc>
Sat, 11 Feb 2017 05:06:12 +0000 (23:06 -0600)
committerkremlin <ian@kremlin.cc>
Sat, 11 Feb 2017 05:06:12 +0000 (23:06 -0600)

Trivial merge