Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESI...
authorBrian Medley <bpm@snafu.org>
Tue, 24 Apr 2012 12:41:48 +0000 (07:41 -0500)
committerBrian Medley <bpm@snafu.org>
Tue, 24 Apr 2012 12:41:48 +0000 (07:41 -0500)

Trivial merge