Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Mon, 16 May 2016 23:05:30 +0000 (16:05 -0700)
committerIvan Kohler <ivan@freeside.biz>
Mon, 16 May 2016 23:05:30 +0000 (16:05 -0700)

Trivial merge