Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Fri, 10 Jul 2015 00:57:01 +0000 (17:57 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 10 Jul 2015 00:57:01 +0000 (17:57 -0700)

Trivial merge