025ba18 Merge branch 'master' into el6

Merged and Committed by toshio 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	python-migrate-0.5.4-rename.patch
    	python-migrate.spec
    	sources
    
        
file modified
+1 -1
file added
+31
file modified
+40 -7
file modified
+1 -1