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)
commit03c05b7e8b6670d8d0a2737840d4bf18f810431b
treef20c2dbee45f544d38ebcdbb8dd5411b4ca2d39a
parent1cc036dfd97eb78144040b27ade8662ea82a56cc
parent5ae915fa38fbd0e55a6760e47194faa50d2212b7
Merge branch 'stable-82x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-82x