[lskat/f20: 9/9] Merge branch 'master' into f20

[Rex Dieter]

commit 7258d35ad017ac8a95459fe8fd03d7b5993d7060
Merge: c4163a8 5ccbecb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 12:06:12 2014 -0600

    Merge branch 'master' into f20

 .gitignore |    6 ++++++
 lskat.spec |   20 +++++++++++++++++++-
 sources    |    2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)
---