Merge branch 'stable-82x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-82x
authorArt Cancro <ajc@uncensored.citadel.org>
Tue, 7 Jan 2014 17:39:23 +0000 (12:39 -0500)
committerArt Cancro <ajc@uncensored.citadel.org>
Tue, 7 Jan 2014 17:39:23 +0000 (12:39 -0500)
commitb5235ed837d76758397f3cb57a418eef62b807d1
tree760d24c2981ff5528247cce7693b00f835ee5c7b
parent03c05b7e8b6670d8d0a2737840d4bf18f810431b
parentb929b37a0e5612f40b3b8555fbd68c0514bca886
Merge branch 'stable-82x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-82x