From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 20 Jul 2016 20:02:15 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=c22d84e565ab16db142395dce2e8621624eff140

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

c22d84e565ab16db142395dce2e8621624eff140