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

[Rex Dieter]

commit 616855d959ad22f438257b7ad99c7e92bb61847e
Merge: 1c784d4 b37d674
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:45:43 2014 -0500

    Merge branch 'master' into f20

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