From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 28 Mar 2016 23:59:14 +0000 (-0700)
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=c41cc3dd17fdb3c80ccc392accec60d6cd092de5;p=freeside.git

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

c41cc3dd17fdb3c80ccc392accec60d6cd092de5