From: Mark Wells <mark@freeside.biz>
Date: Wed, 14 Dec 2016 20:55:27 +0000 (-0800)
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=75ab0df930bcbf5173cdda2ce7704fdcf09d9d39

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

75ab0df930bcbf5173cdda2ce7704fdcf09d9d39