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

Trivial merge