Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Sat, 24 Oct 2015 22:24:42 +0000 (15:24 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 24 Oct 2015 22:24:42 +0000 (15:24 -0700)

Trivial merge