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

[Rex Dieter]

commit d368a5831e7e62ea1435327e1f22756b4fae9ef1
Merge: 40abc42 c31a344
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 20:39:52 2012 -0600

    Merge branch 'f18' into f17

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