[php-aws-sdk/el6: 13/14] Merge branch 'master' into epel7

[Shawn Iwinski]

commit 511c1e5dc60513f9432c9c14af90c8c5c6c3b31c
Merge: 1e99570 ad16ee5
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Tue Sep 23 20:04:05 2014 -0400

    Merge branch 'master' into epel7

 .gitignore       |    1 +
 php-aws-sdk.spec |   11 +++++++----
 sources          |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---