Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com
authorBdale Garbee <bdale@gag.com>
Fri, 8 Jul 2016 02:41:19 +0000 (04:41 +0200)
committerBdale Garbee <bdale@gag.com>
Fri, 8 Jul 2016 02:41:19 +0000 (04:41 +0200)

Trivial merge