[s3cmd/f19: 28/28] Merge branch 'master' into f19

[Matt Domsch]

commit a878563ad7db19ccfbec8b967ba90b946aa2f89c
Merge: e50aabb 6c0e73c
Author: Matt Domsch <matt at domsch.com>
Date:   Tue Feb 4 22:52:34 2014 -0600

    Merge branch 'master' into f19

 .gitignore |    5 +----
 s3cmd.spec |   26 +++++++++++++++++++++-----
 sources    |    2 +-
 3 files changed, 23 insertions(+), 10 deletions(-)
---