Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into 2.3
authorMark Wells <mark@freeside.biz>
Thu, 6 Sep 2012 18:43:07 +0000 (11:43 -0700)
committerMark Wells <mark@freeside.biz>
Thu, 6 Sep 2012 18:43:07 +0000 (11:43 -0700)

Trivial merge