From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 29 Jun 2017 00:23:32 +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=a616d0c27799413dfbe07ee86e75df3e0d5a740f

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

a616d0c27799413dfbe07ee86e75df3e0d5a740f