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

[Matt Domsch]

commit 1c85cb5c1a7d1ad5404aa708bb6cdb7544faf5e8
Merge: 9a7e19c 582cfec
Author: Matt Domsch <matt at domsch.com>
Date:   Thu Feb 5 22:33:03 2015 -0600

    Merge branch 'master' into f20

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