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

[Rex Dieter]

commit e58bc59243220687de6b68bc6ec89e37ceecf0a5
Merge: a353a69 cb58cdd
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:23:37 2014 -0500

    Merge branch 'master' into f20

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