From: Mark Wells <mark@freeside.biz>
Date: Sun, 20 Sep 2015 20:00:57 +0000 (-1000)
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=376b2a33216bcc6c4ba673e6d37adb6e53fa73ac;p=freeside.git

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

376b2a33216bcc6c4ba673e6d37adb6e53fa73ac