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

[Shawn Iwinski]

commit 61203532ddcda0fbd1b243ead20834f07acb57b9
Merge: acfa560 23f4fde
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Sat Feb 15 13:33:35 2014 -0500

    Merge branch 'master' into el6

 .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(-)
---