From: Mark Wells <mark@freeside.biz>
Date: Thu, 6 Sep 2012 18:43:07 +0000 (-0700)
Subject: Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into 2.3
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=84bccd4ca40cec59e1f762cff000b6f026c7f182;p=freeside.git

Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into 2.3
---

84bccd4ca40cec59e1f762cff000b6f026c7f182