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

[Rex Dieter]

commit f16ae7019f7de44b6f917927c1d257967a0704f9
Merge: b513d66 ccd1fa5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 20:29:41 2012 -0600

    Merge branch 'f18' into f17

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