From: Mark Wells <mark@freeside.biz>
Date: Sat, 11 Jul 2015 01:15:08 +0000 (-0700)
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=88bf5db0cca989c51237c661a13078eef08b3674;p=freeside.git

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

88bf5db0cca989c51237c661a13078eef08b3674