[kanagram/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 9198c788219562d0d148483ab2cd671089fa6082
Merge: 33c0534 bda96fc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Dec 30 14:32:24 2012 -0600

    Merge branch 'f18' into f17

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