[mirrormanager] master: Merge branch 'master' of ssh+git://fedorahosted.org/git/mirrormanager (1a5922b)