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

[Matt Domsch]

commit e0f9713f0bab04c2623904a3343efa541ffeb54f
Merge: bb2830c 1a8c54a
Author: Matt Domsch <matt at domsch.com>
Date:   Tue Jul 1 09:25:04 2014 -0500

    Merge branch 'master' into f20

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