From: Mark Wells <mark@freeside.biz>
Date: Wed, 2 Nov 2016 22:35:26 +0000 (-0700)
Subject: Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=ff8440c2e6db69857e88437dcd0f13219abd71e1

Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
---

ff8440c2e6db69857e88437dcd0f13219abd71e1