[web: 2/2] Merge branch 'master' of ssh+git://fedorahosted.org/git/docs/web