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

[Rex Dieter]

commit a30c8d78106cce5f4d5fe93700c7606c51899c51
Merge: 26aa965 2b1ecf0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:42:10 2014 -0500

    Merge branch 'master' into f20

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