From: Brian Medley <bpm@snafu.org>
Date: Fri, 20 Apr 2012 18:28:01 +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=5708d624dcc4557fa38d8f209a324ebb0c3e9644;p=freeside.git

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

5708d624dcc4557fa38d8f209a324ebb0c3e9644