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

[Rex Dieter]

commit 0910db0d5a696145fea07ba65090a447af20a320
Merge: 951b631 b98375b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 07:32:20 2012 -0500

    Merge branch 'f17' into f16

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