From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 2 Sep 2016 00:00:22 +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/?p=freeside.git;a=commitdiff_plain;h=ddb601f6bb7bdce8e0912e78472335f5613d20db

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

ddb601f6bb7bdce8e0912e78472335f5613d20db