From: Mark Wells <mark@freeside.biz>
Date: Thu, 8 Sep 2016 21:40:39 +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=162097d4e2bd08efd71d998406c14cbfeb108d0b

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

162097d4e2bd08efd71d998406c14cbfeb108d0b