Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
authorJonathan Prykop <jonathan@freeside.biz>
Wed, 8 Apr 2015 20:57:00 +0000 (15:57 -0500)
committerJonathan Prykop <jonathan@freeside.biz>
Wed, 8 Apr 2015 20:57:00 +0000 (15:57 -0500)

Trivial merge