From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 23 Nov 2015 02:55:17 +0000 (-0800)
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=812bc7c3fab50cefca3cae5b9430350c5a65a077;p=freeside.git

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

812bc7c3fab50cefca3cae5b9430350c5a65a077