From: Brian Medley <bpm@snafu.org>
Date: Sun, 22 Apr 2012 23:50:10 +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=a97ff9dea55a716af9ea960aa217879950825874;p=freeside.git

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

a97ff9dea55a716af9ea960aa217879950825874