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

[Shawn Iwinski]

commit 2c9825b62a74a5369a167678bdf00c463444b39a
Merge: 6fb6200 2206b61
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sun Jan 26 13:50:28 2014 -0500

    Merge branch 'master' into el6

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