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

Trivial merge