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

[Rex Dieter]

commit c70c2bb9221e0aaeee1dbf33d7c2ae23aefbed28
Merge: 378ae0f 7f1a09d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 19:54:15 2014 -0600

    Merge branch 'master' into f20

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