From: Brian Medley <bpm@snafu.org>
Date: Tue, 24 Apr 2012 12:41:48 +0000 (-0500)
Subject: Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESI... 
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=d261f543458b070d7f60703cc1382980a3064c7a;p=freeside.git

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

d261f543458b070d7f60703cc1382980a3064c7a