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

[Matt Domsch]

commit 8a752a800e38e99c2a1b4640528b9c77b44b2581
Merge: e0f9713 d636cc2
Author: Matt Domsch <matt at domsch.com>
Date:   Tue Jul 1 09:40:02 2014 -0500

    Merge branch 'master' into f20

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