From: Christopher Burger <burgerc@freeside.biz>
Date: Fri, 8 Sep 2017 17:28:32 +0000 (-0400)
Subject: Merge branch 'FREESIDE_3_BRANCH' of freeside.biz:/home/git/freeside into FREESIDE_3_B... 
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=1c67869e4a2bb33d2375ba4cf14272d0bfb1575f;hp=047630eac61dcf23b14e70b3d0004990a2b3718c

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