Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into 3.x
authorMark Wells <mark@freeside.biz>
Thu, 10 Dec 2015 09:01:29 +0000 (01:01 -0800)
committerMark Wells <mark@freeside.biz>
Thu, 10 Dec 2015 09:01:29 +0000 (01:01 -0800)

Trivial merge