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

[Shawn Iwinski]

commit 14a6f4e50350ae5d37df62697e2a15d70aa10a17
Merge: 2497816 11460b3
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sun Jan 26 14:14:24 2014 -0500

    Merge branch 'master' into el6

 drupal6-imagecache-RPM-README.txt |    5 ++
 drupal6-imagecache.spec           |   84 ++++++++++++++++++++++---------------
 2 files changed, 55 insertions(+), 34 deletions(-)
---