From: Bdale Garbee <bdale@gag.com>
Date: Wed, 3 Sep 2014 03:17:44 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com
X-Git-Url: https://git.gag.com/?p=web%2Fgag.com;a=commitdiff_plain;h=76565e8a0338bdb65404e0c1ba6546f41b2a393d;hp=-c

Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com
---

76565e8a0338bdb65404e0c1ba6546f41b2a393d