From: Mark Wells <mark@freeside.biz>
Date: Tue, 3 May 2016 20:50:55 +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=4137519a5a1a9380c59385536883e3e228627ee8

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

4137519a5a1a9380c59385536883e3e228627ee8