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

Trivial merge