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

[Matt Domsch]

commit afc8cc36f6e325d764368c0787f46662810d42b1
Merge: 9ef69a7 d636cc2
Author: Matt Domsch <matt at domsch.com>
Date:   Tue Jul 1 09:41:33 2014 -0500

    Merge branch 'master' into el5

 s3cmd.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---