Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into 3.x
authorMark Wells <mark@freeside.biz>
Thu, 10 Sep 2015 04:51:40 +0000 (21:51 -0700)
committerMark Wells <mark@freeside.biz>
Thu, 10 Sep 2015 04:51:40 +0000 (21:51 -0700)

Trivial merge