Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESI...
authorBrian Medley <bpm@snafu.org>
Fri, 20 Apr 2012 18:28:01 +0000 (13:28 -0500)
committerBrian Medley <bpm@snafu.org>
Fri, 20 Apr 2012 18:28:01 +0000 (13:28 -0500)

Trivial merge