From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 2 Dec 2017 02:23:23 +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=4de16eee62ab478b385ea3a9aeffcaf76d7357cb

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

4de16eee62ab478b385ea3a9aeffcaf76d7357cb