[php-simplepie/el6: 2/2] Merge branch 'master' into el6

[Nick Bebout]

commit 62f25ca72686aa3128e0e242cf50c4f74e0d1f39
Merge: 03e5034 2548119
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Dec 18 20:18:12 2012 -0600

    Merge branch 'master' into el6

 php-simplepie.spec |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)
---