[cpuid/el6: 2/2] Merge branch 'f20' into el6

[Fabian Affolter]

commit 417a3dee869b03c0f9bd0414e48a8ba1deedbdbd
Merge: 07e5cf6 0876ab4
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Jan 25 22:09:08 2014 +0100

    Merge branch 'f20' into el6

 .gitignore |    1 +
 cpuid.spec |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---