From: Mark Wells <mark@freeside.biz>
Date: Wed, 21 Dec 2016 23:37:36 +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=0fa98e9782d550147a68a00d7ee75079ad331666

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

0fa98e9782d550147a68a00d7ee75079ad331666