From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 29 Jun 2017 20:39:47 +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=9d6c810bf70d12221ff3b7916b717a6f0c924a1c

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

9d6c810bf70d12221ff3b7916b717a6f0c924a1c