From: Jonathan Prykop <jonathan@freeside.biz>
Date: Sat, 4 Jun 2016 00:54:20 +0000 (-0500)
Subject: Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE... 
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=c6c69f3dceb427a8377cc49a44a16be16d822948;p=freeside.git

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

c6c69f3dceb427a8377cc49a44a16be16d822948