Merge branch 'stable-82x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-82x
authorArt Cancro <ajc@uncensored.citadel.org>
Tue, 7 Jan 2014 17:39:23 +0000 (12:39 -0500)
committerArt Cancro <ajc@uncensored.citadel.org>
Tue, 7 Jan 2014 17:39:23 +0000 (12:39 -0500)

Trivial merge