From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 13 Sep 2017 00:12:03 +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=sidebyside;h=6f94e176aa7b143eb9f1fa5c3a1cdd362361636f;p=freeside.git

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

6f94e176aa7b143eb9f1fa5c3a1cdd362361636f