From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 17 Jul 2018 01:43:48 +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=2a9d2460814b37e07d7cb83392723146a60d34c7

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

2a9d2460814b37e07d7cb83392723146a60d34c7