Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into 2.3
authorMark Wells <mark@freeside.biz>
Thu, 7 Mar 2013 22:45:13 +0000 (14:45 -0800)
committerMark Wells <mark@freeside.biz>
Thu, 7 Mar 2013 22:45:13 +0000 (14:45 -0800)

Trivial merge