Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Mon, 11 Jan 2016 15:05:28 +0000 (07:05 -0800)
committerIvan Kohler <ivan@freeside.biz>
Mon, 11 Jan 2016 15:05:28 +0000 (07:05 -0800)

Trivial merge