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

[Rex Dieter]

commit 32157fa6bb3c27cc13924a76f0f435cd868e0642
Merge: 3f0bf60 edf04ee
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 11:28:03 2014 -0600

    Merge branch 'master' into f20

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