Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorArt Cancro <ajc@citadel.org>
Sun, 3 Jan 2016 04:45:15 +0000 (23:45 -0500)
committerArt Cancro <ajc@citadel.org>
Sun, 3 Jan 2016 04:45:15 +0000 (23:45 -0500)
commit79bddf1aaf7c65188a812102bd91c6158ce3f0a4
tree271cac432921f04bcae8450ec5d0bbec6b2240ae
parent2807ad968981de0aae10473ee5fbd7a4c0d513bd
parent741c4386b78b7abb03213e592d237e51e2569784
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel