Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorIvan Kohler <ivan@freeside.biz>
Sun, 4 Jan 2015 03:07:45 +0000 (19:07 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sun, 4 Jan 2015 03:07:45 +0000 (19:07 -0800)

Trivial merge