From: Mark Wells <mark@freeside.biz>
Date: Mon, 13 Jun 2016 20:31:34 +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=b8ef252dd1dd11fb151d75d18e47528851efc2a5;p=freeside.git

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

b8ef252dd1dd11fb151d75d18e47528851efc2a5