From: Mark Wells <mark@freeside.biz>
Date: Mon, 17 Oct 2016 23:15:44 +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=c768181f5e2f4fd5ffcc02e504ce6fa6d73b3922

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

c768181f5e2f4fd5ffcc02e504ce6fa6d73b3922