From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 21 Jul 2015 16:50:48 +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=306f474a1f0b682d4815a8f9bd1a000fd4654253;p=freeside.git

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

306f474a1f0b682d4815a8f9bd1a000fd4654253