Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Tue, 31 Jan 2017 19:48:14 +0000 (11:48 -0800)
committerIvan Kohler <ivan@freeside.biz>
Tue, 31 Jan 2017 19:48:14 +0000 (11:48 -0800)

Trivial merge