Merge branch 'stable-82x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-82x v8.22
authorArt Cancro <ajc@uncensored.citadel.org>
Sun, 27 Oct 2013 02:52:30 +0000 (22:52 -0400)
committerArt Cancro <ajc@uncensored.citadel.org>
Sun, 27 Oct 2013 02:52:30 +0000 (22:52 -0400)
commit00f5b8d5b752936ff41c54b80ba429a8de313b95
tree264375b2585af443514ff42c9200cfde27fc72e2
parent06261a3dcfcee92576600ceeca50011037771873
parent7e9b24118b1b19997d26b68ed86c6e1f8acf6f00
Merge branch 'stable-82x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-82x