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

[Rex Dieter]

commit 4cc5e83ea8c18d94cc87bbf10d970693dba2d204
Merge: c5c5856 3fc0ea3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 20:31:34 2012 -0600

    Merge branch 'f18' into f17

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