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

[Shawn Iwinski]

commit e6ec7028b175b29f10d1f78ec6efeefb72fe5c11
Merge: 2cf8804 578673c
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sat Oct 18 11:07:50 2014 -0400

    Merge branch 'master' into el6

 LICENSE.txt                     |  339 ---------------------------------------
 drupal7-feeds-fedora-README.txt |    6 -
 drupal7-feeds.spec              |   94 +++++++----
 3 files changed, 63 insertions(+), 376 deletions(-)
---