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

[Rex Dieter]

commit 02e0e51aa9e03a326b76844c9900bff3008ab314
Merge: 2c2cc29 1d3a946
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:50:59 2014 -0500

    Merge branch 'master' into f20

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