Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Sat, 8 Aug 2015 05:01:31 +0000 (22:01 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 8 Aug 2015 05:01:31 +0000 (22:01 -0700)

Trivial merge