[s3cmd/infrastructure: 16/17] Merge branch 'infrastructure' of ssh://pkgs.fedoraproject.org/s3cmd into infrastructure

[Matt Domsch]

commit e4bb77ad5bd1cbd5e743ffc3431b1e0ccfc1f553
Merge: 79312a2 e463a49
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Mon May 20 09:54:27 2013 -0500

    Merge branch 'infrastructure' of ssh://pkgs.fedoraproject.org/s3cmd into infrastructure
    
    Conflicts:
    	.gitignore
    	s3cmd.spec
    	sources

 s3cmd.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --cc s3cmd.spec
index 6f271f1,ef441ef..12cef01
--- a/s3cmd.spec
+++ b/s3cmd.spec
@@@ -1,9 -1,9 +1,8 @@@
  %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
  
  Name:           s3cmd
 -Version:        1.1.0
 -%define git 11e5755e
 -Release:        0.4.git%{git}%{?dist}
 +Version:        1.5.0
- %define git b1ae0fbe
 +Release:        0.1.git%{git}%{?dist}
  Summary:        Tool for accessing Amazon Simple Storage Service
  
  Group:          Applications/Internet