[python-suds/el6: 9/9] Merge branch 'master' into el6

Dan Horák sharkcz at fedoraproject.org
Wed Jun 8 15:27:21 UTC 2011


commit d9949523688961ae8706298b710b0926b97fc035
Merge: 70b219a b6601a7
Author: Dan Horák <dan at danny.cz>
Date:   Wed Jun 8 17:26:43 2011 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	python-suds.spec
    	sources

 .gitignore       |    4 ++++
 python-suds.spec |   28 +++++++++++++++++++++++-----
 sources          |   10 +---------
 3 files changed, 28 insertions(+), 14 deletions(-)
---
diff --cc sources
index 6f09b15,16b2551..7330143
--- a/sources
+++ b/sources
@@@ -1,9 -1,10 +1,1 @@@
--ae5a7e1f39c63ecf2c5622d687d6981c  python-suds-0.3.1.tar.gz
--a4544f1eaaeb3ca0e78180160909ab01  python-suds-0.3.2.tar.gz
--79cace44ca04955f2cdb8fe682b5f05d  python-suds-0.3.3.tar.gz
--3c704119a5a27542ea5347fc13433b89  python-suds-0.3.4.tar.gz
--2fc4bbbb2351b24e707eac8434d5cb73  python-suds-0.3.5.tar.gz
--320b2f8816aca6445b31441eb201e95b  python-suds-0.3.6.tar.gz
--687a1287e5e86da42d1b161f29d58886  python-suds-0.3.7.tar.gz
--74122f391f73e91dfee5b5435aa51a38  python-suds-0.3.8.tar.gz
--420ac4b6ba788e43631b74719a470bf7  python-suds-0.3.9.tar.gz
+ 89316bb848c63c44d209be02a77be74e  python-suds-0.4.1.tar.gz


More information about the scm-commits mailing list