Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Tue, 2 Feb 2016 17:10:37 +0000 (09:10 -0800)
committerIvan Kohler <ivan@freeside.biz>
Tue, 2 Feb 2016 17:10:37 +0000 (09:10 -0800)

Trivial merge