From: Mark Wells <mark@freeside.biz>
Date: Tue, 24 Nov 2015 00:31:55 +0000 (-0800)
Subject: Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=d176b11b1730eeff8c19456c18f8e852c99fc423;p=freeside.git

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

d176b11b1730eeff8c19456c18f8e852c99fc423