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

[Shawn Iwinski]

commit b64e40fa2f19ee028fb3c60b154f286608a332f6
Merge: 6671191 78ed5a1
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sun Aug 31 18:03:23 2014 -0400

    Merge branch 'master' into el5

 .gitignore             |    1 +
 drupal6-filefield.spec |   18 ++++++++++++------
 sources                |    3 +--
 3 files changed, 14 insertions(+), 8 deletions(-)
---