[python-fedora: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-fedora

[Toshio くらとみ]

commit 9e88d7e9efb1bcd5b41a408037bb7cfd47220a64
Merge: fbafc9f 03740c7
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Jul 26 16:12:27 2011 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-fedora
    
    Conflicts:
    	.gitignore
    	python-fedora.spec
    	sources

 .gitignore |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 498f389,89be412..b628318
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,4 +1,1 @@@
--python-fedora-0.3.20.tar.gz
--/python-fedora-0.3.21.tar.gz
--/python-fedora-0.3.22.tar.gz
 -/python-fedora-0.3.23.tar.gz
 +/python-fedora-0.3.24.tar.gz