Merge branch 'stable-82x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-82x
authorArt Cancro <ajc@uncensored.citadel.org>
Thu, 2 Jan 2014 14:48:06 +0000 (09:48 -0500)
committerArt Cancro <ajc@uncensored.citadel.org>
Thu, 2 Jan 2014 14:48:06 +0000 (09:48 -0500)

Trivial merge