[install-guide/f21-branch: 3/3] Merge branch 'f21-branch' of ssh://git.fedorahosted.org/git/docs/install-guide into f21-branch

[pbokoc]

commit e5173e81bf7b1875a73d70ae2bb66a36b7ae8f44
Merge: e5463a6 e611d1f
Author: Petr Bokoc <pbokoc at redhat.com>
Date:   Wed Dec 10 16:04:54 2014 +0100

    Merge branch 'f21-branch' of ssh://git.fedorahosted.org/git/docs/install-guide into f21-branch

---