[php-simplepie/el5: 14/14] Merge branch 'master' into el5

[Matej Cepl]

commit e8bd7b77c614fbd82229dd9a0be071ca2e09975c
Merge: f9342e8 73ce8b1
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Jan 2 13:29:46 2013 +0100

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	php-simplepie.spec
    	sources

 .gitignore                 |    2 +
 php-simplepie-php533.patch |   20 ++++++++++
 php-simplepie.spec         |   84 +++++++++++++++++++++++++++++++++++++++-----
 sources                    |    2 +-
 4 files changed, 98 insertions(+), 10 deletions(-)
---