Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Sat, 13 Feb 2016 22:56:33 +0000 (14:56 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 13 Feb 2016 22:56:33 +0000 (14:56 -0800)

Trivial merge