From: Mark Wells <mark@freeside.biz>
Date: Fri, 8 Jul 2016 03:22:45 +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/?a=commitdiff_plain;h=db1221a82f407c9ebc782ff03e9cf61115eef8cb;hp=db1221a82f407c9ebc782ff03e9cf61115eef8cb;p=freeside.git

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