5e74deb Merge branch 'epel7' of ssh://pkgs.fedoraproject.org/synergy into epel7

Merged and Committed by dchen 8 years ago
    Merge branch 'epel7' of ssh://pkgs.fedoraproject.org/synergy into epel7
    
    Conflicts:
    	.gitignore
    	sources
    
        
file modified
+0 -3
file modified
+0 -2