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

[Rex Dieter]

commit c929f5a108e7847ff07ca2d293d741d63e11f029
Merge: 960ecac f57f9c8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 19:55:06 2014 -0600

    Merge branch 'master' into f20

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