[s3cmd/epel7: 4/4] Merge branch 'master' into epel7

[Matt Domsch]

commit 3f3523614abda5ffa5108eb55f2134bef375c7e6
Merge: 519ee0f d636cc2
Author: Matt Domsch <matt at domsch.com>
Date:   Tue Jul 1 22:21:27 2014 -0500

    Merge branch 'master' into epel7

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