Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESI...
authorBrian Medley <bpm@snafu.org>
Sun, 22 Apr 2012 23:50:10 +0000 (18:50 -0500)
committerBrian Medley <bpm@snafu.org>
Sun, 22 Apr 2012 23:50:10 +0000 (18:50 -0500)

Trivial merge