[s3cmd/el5: 3/3] Merge branch 'master' into el5

[Matt Domsch]

commit 9ef69a7f1b891ee096a354728673be377e53aeaa
Merge: 76cf848 1a8c54a
Author: Matt Domsch <matt at domsch.com>
Date:   Tue Jul 1 09:35:40 2014 -0500

    Merge branch 'master' into el5

 .gitignore |    1 +
 s3cmd.spec |   14 ++++++++++----
 sources    |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
---