[ksnapshot/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 98c9172dd55cbff95665d1bfb170abc10e6aa9e8
Merge: fd82cf9 90d331a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:53:59 2012 -0600

    Merge branch 'f18' into f17

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