Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Sat, 30 Jan 2016 01:08:51 +0000 (17:08 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 30 Jan 2016 01:08:51 +0000 (17:08 -0800)

Trivial merge