Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESI...
authorBrian Medley <bpm@snafu.org>
Sat, 28 Apr 2012 00:17:57 +0000 (19:17 -0500)
committerBrian Medley <bpm@snafu.org>
Sat, 28 Apr 2012 00:17:57 +0000 (19:17 -0500)

Trivial merge