From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 4 May 2016 23:22:44 +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=bb64a357a453b06e0079444ce21c7e85d9c1527d

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

bb64a357a453b06e0079444ce21c7e85d9c1527d