Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
authorMark Wells <mark@freeside.biz>
Sat, 11 Jul 2015 01:15:08 +0000 (18:15 -0700)
committerMark Wells <mark@freeside.biz>
Sat, 11 Jul 2015 01:15:08 +0000 (18:15 -0700)

Trivial merge