From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 16 Dec 2017 00:43:57 +0000 (-0800)
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=94be7e58a807d822aaa34151c5da9346c976d7a0

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

94be7e58a807d822aaa34151c5da9346c976d7a0