Merge branch 'master' of ssh://git.citadel.org:/appl/gitroot/citadel
authorArt Cancro <ajc@citadel.org>
Mon, 28 Aug 2017 23:09:28 +0000 (19:09 -0400)
committerArt Cancro <ajc@citadel.org>
Mon, 28 Aug 2017 23:09:28 +0000 (19:09 -0400)
commitfbfd4f7c2a258c74f05d9a9a63eeb83273b101da
treec5c27a13354d347d17ce047c9b72d043199d6cb5
parent9a7546b0fd81cebb759c3b8732c9ff5d9d71aa0f
parente42596a94e31ac9f5106f62d83dc56ddbd779b6a
Merge branch 'master' of ssh://git.citadel.org:/appl/gitroot/citadel