[palapeli/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit 45dde3502863fb3010311e309dcf591d85a0aac8
Merge: b96e598 3f1b080
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:51:07 2013 -0500

    Merge branch 'master' into f19

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