From: Art Cancro <ajc@uncensored.citadel.org>
Date: Thu, 2 Jan 2014 14:48:06 +0000 (-0500)
Subject: Merge branch 'stable-82x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-82x
X-Git-Tag: v8.24~10
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=03c05b7e8b6670d8d0a2737840d4bf18f810431b

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

03c05b7e8b6670d8d0a2737840d4bf18f810431b