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

[Rex Dieter]

commit 378ae0ff17c8cc3b8420e3b515b27b279272e921
Merge: b02931d dc5e27a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 21:51:58 2014 -0500

    Merge branch 'master' into f20

 .gitignore    |    1 +
 kanagram.spec |    9 +++++++--
 sources       |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---