From: Mark Wells <mark@freeside.biz>
Date: Thu, 10 Dec 2015 09:01:29 +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=e7bad3b31830cd1c838c607a3336413a4c5ed50c

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

e7bad3b31830cd1c838c607a3336413a4c5ed50c