[php-aws-sdk/f19: 2/2] Merge branch 'master' into f19

[Joseph Marrero]

commit c6daa04a5bc982aacd31cb0f7df5b8574cb52602
Merge: 5808f99 bb7c922
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Sun Dec 29 13:19:29 2013 -0400

    Merge branch 'master' into f19

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