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

[Jared Smith]

commit c4b854a12e9a0919fece1ce778b5a0f41bcfc9fd
Merge: 5dc2d46 811f7af
Author: Jared K. Smith <jsmith at fedoraproject.org>
Date:   Thu Apr 25 10:04:41 2013 -0400

    Merge branch 'master' into el6

 .gitignore         |    1 +
 drupal7-feeds.spec |   11 +++++++++--
 sources            |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 84f082f,097effd..8cf349a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -/feeds-7.x-2.0-alpha4.tar.gz
  /feeds-7.x-2.0-alpha6.tar.gz
  /feeds-7.x-2.0-alpha7.tar.gz
+ /feeds-7.x-2.0-alpha8.tar.gz