[uefi-secure-boot-guide] master: Merge branch 'master' of git://git.fedorahosted.org/git/docs/uefi-secure-boot-guide into bressers (14ab4c6)

[sparks at fedoraproject.org]

Repository : http://git.fedorahosted.org/git/?p=docs/uefi-secure-boot-guide.git

On branch  : master

>---------------------------------------------------------------

commit 14ab4c6ec88e009e4984b7c2dcd7dd0192e7c2d7
Merge: 4d20d45 257e4aa
Author: Josh Bressers <josh at bress.net>
Date:   Thu Jan 31 19:20:24 2013 -0600

    Merge branch 'master' of git://git.fedorahosted.org/git/docs/uefi-secure-boot-guide into bressers
    
    Conflicts:
    	en-US/Implementation_of_Secure_Boot.xml



>---------------------------------------------------------------

 0 files changed, 0 insertions(+), 0 deletions(-)