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

[Matt Domsch]

commit 26607fdf70fe9495d15586295b308e1deb17be1f
Merge: 4c906f7 175787b
Author: Matt Domsch <matt at domsch.com>
Date:   Wed Feb 4 13:10:32 2015 -0600

    Merge branch 'master' into f20

 .gitignore |    1 +
 s3cmd.spec |    9 ++++++---
 sources    |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---