Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com
authorBdale Garbee <bdale@gag.com>
Mon, 2 Nov 2015 16:49:09 +0000 (09:49 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 2 Nov 2015 16:49:09 +0000 (09:49 -0700)

Trivial merge