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

Trivial merge