[katomic/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 5ee8e2bb78d693ff5b98541f3cdbb0f93b61dcee
Merge: a30c8d7 8d91834
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:24:19 2014 -0500

    Merge branch 'master' into f20

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