Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorArt Cancro <ajc@uncensored.citadel.org>
Tue, 19 Nov 2013 16:49:48 +0000 (11:49 -0500)
committerArt Cancro <ajc@uncensored.citadel.org>
Tue, 19 Nov 2013 16:49:48 +0000 (11:49 -0500)
commit6ae0819ac13984a0dfa583281fc0081af735c77d
treed9e9df2e5cdcc7098d3d7ab59e1e5004de9ec40e
parent1aa2da0249792527f99172681aecc77e0ad086af
parentb8674e7f0ca0cab4ba65e01af2d775fa1e417dad
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel