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

[Than Ngo]

commit 5f1ec3f70ba0289786f46fdfabdb7b532b993720
Merge: e7c8bec 24cde7b
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:46:45 2012 +0100

    Merge branch 'f18' into f17

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