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

[Rex Dieter]

commit 2c2cc295c174e9aecd6afb48c76920b12d1e009e
Merge: baf6707 c08c71c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:21:55 2014 -0500

    Merge branch 'master' into f20

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