[php-simplepie/f16: 4/4] Merge branch 'master' into f16

[Nick Bebout]

commit 70fcb68f90e0565148bbab8123d474eb487caf94
Merge: f922022 203c39c
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Dec 12 21:28:38 2012 -0600

    Merge branch 'master' into f16

 .gitignore         |    1 +
 php-simplepie.spec |   16 ++++++++++++----
 sources            |    2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
---