Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Sat, 2 Apr 2016 17:34:35 +0000 (10:34 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 2 Apr 2016 17:34:35 +0000 (10:34 -0700)

Trivial merge