Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into 3.x
authorMark Wells <mark@freeside.biz>
Wed, 21 Dec 2016 23:37:36 +0000 (15:37 -0800)
committerMark Wells <mark@freeside.biz>
Wed, 21 Dec 2016 23:37:36 +0000 (15:37 -0800)

Trivial merge