[python-polib/el5: 11/11] Merge branch 'el5' of ssh://pkgs.fedoraproject.org/python-polib into el5

[Ding-Yi Chen]

commit b0f58873ffe0d63120c8616229426de37cdea82c
Merge: 65e9086 37690fc
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Fri Oct 28 17:24:27 2011 +1000

    Merge branch 'el5' of ssh://pkgs.fedoraproject.org/python-polib into el5
    
    Conflicts:
    	.gitignore
    	python-polib.spec
    	sources

 branch     |    1 -
 import.log |    2 --
 2 files changed, 0 insertions(+), 3 deletions(-)
---