Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorJonathan Prykop <jonathan@freeside.biz>
Fri, 29 Jan 2016 21:14:33 +0000 (15:14 -0600)
committerJonathan Prykop <jonathan@freeside.biz>
Fri, 29 Jan 2016 21:14:33 +0000 (15:14 -0600)

Trivial merge