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

[Rex Dieter]

commit 5c0b2efca2afaab90054bd3b370490eea4a6b18a
Merge: 7649a9e 7384c46
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:50:02 2014 -0500

    Merge branch 'master' into f20

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