From: Mark Wells <mark@freeside.biz>
Date: Thu, 10 Sep 2015 04:51:40 +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=1dd6898c05a298171fba7f38ef100036541d387e

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

1dd6898c05a298171fba7f38ef100036541d387e