Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorBrian Medley <bpm@snafu.org>
Fri, 20 Apr 2012 17:41:57 +0000 (12:41 -0500)
committerBrian Medley <bpm@snafu.org>
Fri, 20 Apr 2012 17:41:57 +0000 (12:41 -0500)

Trivial merge