[drupal6-imageapi/f19: 3/3] Merge branch 'master' into f19

[Shawn Iwinski]

commit ffe2125a6bd1a5e154a8f600c0a7ea3be8ce10d3
Merge: 53f70a5 2206b61
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sun Jan 26 13:52:39 2014 -0500

    Merge branch 'master' into f19

 drupal6-imageapi-RPM-README.txt |    5 ++
 drupal6-imageapi.spec           |   89 ++++++++++++++++++++++----------------
 2 files changed, 56 insertions(+), 38 deletions(-)
---