[microcode_ctl/f18: 2/2] Merge branch 'f19' into f18

[Anton Arapov]

commit 3f5d5f69a5ff4e7f67402bf4e10f46d6013727e0
Merge: fbf996c 9121eb0
Author: Anton Arapov <anton at descope.org>
Date:   Fri Jan 24 09:04:28 2014 +0100

    Merge branch 'f19' into f18

 .gitignore         |    1 +
 microcode_ctl.spec |    7 +++++--
 sources            |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 2a42c73,1b1aa7f..59b748f
--- a/.gitignore
+++ b/.gitignore
@@@ -20,5 -20,8 +20,6 @@@ microcode-20100826.da
  /microcode_ctl-2.0-1.tar.xz
  /microcode_ctl-2.0-2.tar.xz
  /microcode_ctl-2.0-3.tar.xz
 -/microcode_ctl-2.1-1.tar.xz
 -/microcode_ctl-2.1-1.1.tar.xz
  /microcode_ctl-2.0-4.tar.xz
  /microcode_ctl-2.0-5.tar.xz
+ /microcode_ctl-2.0-6.tar.xz