From: Mark Wells <mark@freeside.biz>
Date: Thu, 8 Sep 2016 21:54:58 +0000 (-0700)
Subject: Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into 3.x
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=fc71c5a7a2b5595ef38621ead753c6b261c534ba

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

fc71c5a7a2b5595ef38621ead753c6b261c534ba