From: Mark Wells <mark@freeside.biz>
Date: Wed, 16 Nov 2016 19:58:33 +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=d8844f49839b56eac11ee931f730d6e47f1ef628

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

d8844f49839b56eac11ee931f730d6e47f1ef628