Merge branch 'stable-82x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-82x v8.22
authorArt Cancro <ajc@uncensored.citadel.org>
Sun, 27 Oct 2013 02:52:30 +0000 (22:52 -0400)
committerArt Cancro <ajc@uncensored.citadel.org>
Sun, 27 Oct 2013 02:52:30 +0000 (22:52 -0400)

Trivial merge