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

[Rex Dieter]

commit 002f0b07ae7a4beaaeae1a5d6b4ecf947110a384
Merge: 5d33174 763a2ad
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 10:45:54 2015 -0600

    Merge branch 'master' into f20

 .gitignore |    2 ++
 lskat.spec |   12 +++++++++---
 sources    |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---