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

Trivial merge