From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 25 Apr 2016 21:45:06 +0000 (-0700)
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=d70cfa65d09780eeb9ff020e122b73634c5c6b35;p=freeside.git

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

d70cfa65d09780eeb9ff020e122b73634c5c6b35