[drupal7-feeds/el5: 4/4] Merge branch 'master' into el5

[Peter Borsa]

commit b8d5dc8b8e8cec3aaf1fe474df044222f0be3f83
Merge: 55b7f82 0183235
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Wed Oct 10 21:26:48 2012 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	sources

 .gitignore         |    3 ++-
 drupal7-feeds.spec |   10 ++++++++--
 sources            |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---