From: Brian Medley <bpm@snafu.org>
Date: Sat, 28 Apr 2012 00:17:57 +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=22dd966b4dac5e4146424cc7338abcf1264bc87d;p=freeside.git

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

22dd966b4dac5e4146424cc7338abcf1264bc87d