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

[Rex Dieter]

commit bde5a92cd248bbaa9da3c8215009701a916d7e3f
Merge: 616855d e06a504
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:32:31 2014 -0500

    Merge branch 'master' into f20

 .gitignore     |    3 +++
 ksnapshot.spec |   14 +++++++++++++-
 sources        |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---