[drupal6-filefield/el5: 7/7] Merge branch 'master' into el5

[Shawn Iwinski]

commit 66711919e4fe9658614cba12b9914a11f84635dd
Merge: 14ae296 23f4fde
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Sat Feb 15 13:33:17 2014 -0500

    Merge branch 'master' into el5

 .gitignore                          |    1 +
 drupal6-filefield-RPM-README.txt    |    5 ++
 drupal6-filefield-fedora-README.txt |    6 --
 drupal6-filefield.spec              |  102 ++++++++++++++++++++++++----------
 sources                             |    1 +
 5 files changed, 79 insertions(+), 36 deletions(-)
---