Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Mon, 23 Nov 2015 02:55:17 +0000 (18:55 -0800)
committerIvan Kohler <ivan@freeside.biz>
Mon, 23 Nov 2015 02:55:17 +0000 (18:55 -0800)

Trivial merge