[python-boto/el5/master: 22/22] Merge remote branch 'origin/master' into el5

Robert Scheck robert at fedoraproject.org
Sun Jan 2 23:08:05 UTC 2011


commit 7329ee00af45bbb1292b768096ccd4f856be8152
Merge: 1d46706 73b1fdc
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Jan 3 00:07:40 2011 +0100

    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore
    	python-boto.spec
    	sources

 .gitignore                      |    2 +-
 python-boto-1.9b-image.patch    |   42 +++++++++++++
 python-boto-1.9b-prefix.patch   |   15 +++++
 python-boto-1.9b-python24.patch |  121 +++++++++++++++++++++++++++++++++++++++
 python-boto-1.9b-python27.patch |   27 +++++++++
 python-boto.spec                |   74 +++++++++++++++++++-----
 sources                         |    2 +-
 7 files changed, 267 insertions(+), 16 deletions(-)
---


More information about the scm-commits mailing list