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

[Shawn Iwinski]

commit e2693e3d0c2b65858d3800ec7a795fd6223ee840
Merge: 6120353 78ed5a1
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sun Aug 31 18:04:27 2014 -0400

    Merge branch 'master' into el6

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