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

[Rex Dieter]

commit 1d677c17ce40eec2b5841564875c033bc2b0d958
Merge: da0af6f ead63bf
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:07:56 2012 -0500

    Merge branch 'f18' into f17

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