[aqemu: 1/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/aqemu

[Stephen Gordon]

commit 2d44aba8c51b9395fd8741096d7d06a984373490
Merge: bd96665 4a3eb95
Author: Stephen Gordon <sgordon at redhat.com>
Date:   Fri Jul 4 11:46:13 2014 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/aqemu
    
    Conflicts:
    	aqemu-0.8.2-format-security.patch

 aqemu.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc aqemu.spec
index c678d22,c678d22..64205e2
--- a/aqemu.spec
+++ b/aqemu.spec
@@@ -31,7 -31,7 +31,7 @@@ majority of QEMU and KVM options on the
  %setup -q
  %patch0
  %patch1
--%patch2
++%patch2 -p1
  
  %build
  %cmake