From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 25 Aug 2017 22:06: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=cbfeb5f6b7490f78361318ce6290bfb442dbfcbe

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

cbfeb5f6b7490f78361318ce6290bfb442dbfcbe