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

[Rex Dieter]

commit b513d66671b93fb18db47abbca151b0154aef384
Merge: 9a31200 a89f3aa
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 16:55:02 2012 -0500

    Merge branch 'f18' into f17

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