Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorJonathan Prykop <jonathan@freeside.biz>
Wed, 4 Jan 2017 00:01:05 +0000 (18:01 -0600)
committerJonathan Prykop <jonathan@freeside.biz>
Wed, 4 Jan 2017 00:01:05 +0000 (18:01 -0600)

Trivial merge