From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 30 Jun 2017 18:06:01 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;ds=inline;h=dac04466f7952a48beb760bd8fac7d380c4eb6be;p=freeside.git

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

dac04466f7952a48beb760bd8fac7d380c4eb6be