Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorJonathan Prykop <jonathan@freeside.biz>
Thu, 12 Feb 2015 19:30:03 +0000 (13:30 -0600)
committerJonathan Prykop <jonathan@freeside.biz>
Thu, 12 Feb 2015 19:30:03 +0000 (13:30 -0600)

Trivial merge