From: Mark Wells <mark@freeside.biz>
Date: Thu, 10 Dec 2015 09:03:17 +0000 (-0800)
Subject: Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=93606bc1854625bfffb8316630bbd4d987d161ec;p=freeside.git

Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
---

93606bc1854625bfffb8316630bbd4d987d161ec