From: Mark Wells <mark@freeside.biz>
Date: Tue, 10 May 2016 20:11:10 +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=5000d886f3c9d7b57e6dd36431223a1ba1e200a0

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

5000d886f3c9d7b57e6dd36431223a1ba1e200a0