Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
authorMark Wells <mark@freeside.biz>
Tue, 19 Jul 2016 19:56:49 +0000 (12:56 -0700)
committerMark Wells <mark@freeside.biz>
Tue, 19 Jul 2016 19:56:49 +0000 (12:56 -0700)

Trivial merge