1a0c3a0 Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-fedora

Merged and Committed by toshio 13 years ago
file modified
+4 -1