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

Trivial merge