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

[Jared Smith]

commit 84ece15eb85d36515802d8722741d13c28ce6948
Merge: 348d5e8 811f7af
Author: Jared K. Smith <jsmith at fedoraproject.org>
Date:   Thu Apr 25 10:05:38 2013 -0400

    Merge branch 'master' into el5

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