From: Mark Wells <mark@freeside.biz>
Date: Tue, 19 Jul 2016 19:56:49 +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/?a=commitdiff_plain;h=43f9be2fd8ef088788ade01d2e4bcc0667be36e5;p=freeside.git

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

43f9be2fd8ef088788ade01d2e4bcc0667be36e5