From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 26 Aug 2015 17:46:56 +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=af6c7cfb1670812193223561fa3cfe7e6ba53acc;p=freeside.git

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

af6c7cfb1670812193223561fa3cfe7e6ba53acc