689fa5b Merge branch 'master' of ssh://pkgs.fedoraproject.org/emacs-common-ess

Merged and Committed by alexlan 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/emacs-common-ess
    
    Conflicts:
    	emacs-common-ess.spec
    
        
file modified
+4 -0