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

[Rex Dieter]

commit 6611b42fa0d544da95f691c8814183f3b2563573
Merge: a358330 c9cc5b5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 10:39:39 2015 -0600

    Merge branch 'master' into f20

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