e935bbf Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-nikola

Merged and Committed by immanetize 9 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-nikola
    
    Conflicts:
    	python-nikola.spec
    
        
file modified
+13 -0