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

[Rex Dieter]

commit a353a690b21fe8f5a1a4e449aac4726550ed7809
Merge: 96d273f 79eefef
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:41:06 2014 -0500

    Merge branch 'master' into f20

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