From: Mark Wells <mark@freeside.biz>
Date: Mon, 17 Oct 2016 23:15:54 +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=7334227ea36b450e71c028e7ba564f91e7d4d1de

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

7334227ea36b450e71c028e7ba564f91e7d4d1de