From: Mark Wells <mark@freeside.biz>
Date: Sun, 20 Sep 2015 20:01:11 +0000 (-1000)
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=f7ae793c0a72474666cac1aa4b6f4ef6291712d5

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

f7ae793c0a72474666cac1aa4b6f4ef6291712d5