From: Jonathan Prykop <jonathan@freeside.biz>
Date: Thu, 28 Apr 2016 20:44:41 +0000 (-0500)
Subject: Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE... 
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=f0cf935a32a2e0186dfff6c30513693965a68cf9;p=freeside.git

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

f0cf935a32a2e0186dfff6c30513693965a68cf9