From: Art Cancro <ajc@uncensored.citadel.org>
Date: Sun, 27 Oct 2013 02:52:30 +0000 (-0400)
Subject: Merge branch 'stable-82x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-82x
X-Git-Tag: v8.22
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=refs%2Ftags%2Fv8.22

Merge branch 'stable-82x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-82x
---

00f5b8d5b752936ff41c54b80ba429a8de313b95