From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 17 Oct 2017 21:22:19 +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=dfbcb60e8b9207bd9aa7ebd297ff9d2599121bf5

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

dfbcb60e8b9207bd9aa7ebd297ff9d2599121bf5