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

Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into 3.x
---

ec8ee23d8ac9dfbf1be574e022f11b6b89085037