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

[Rex Dieter]

commit 1c784d49039eb52bfa9f1d071d36c44063d28317
Merge: 983e5e3 2aa7364
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:14:33 2014 -0500

    Merge branch 'master' into f20

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