Summary of changes: 6c0d425... allow yumrepo proxy attribute to be set to _none_ (*) 681de69... Merge branch 'master' into epel7 (*) This commit already existed in another branch; no separate mail sent