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

[Jared Smith]

commit 31a55bcba783f72734047c0c97fc3f8373d8a8b9
Merge: e480101 811f7af
Author: Jared K. Smith <jsmith at fedoraproject.org>
Date:   Thu Apr 25 10:03:29 2013 -0400

    Merge branch 'master' into f17

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