From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 2 Jun 2017 21:21:22 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=00366d997194ebfa62b8502e638cdfef4c932256;hp=00366d997194ebfa62b8502e638cdfef4c932256;p=freeside.git

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