93c83c4 Merge branch 'master' of ssh://pkgs.fedoraproject.org/sticky-notes

Merged and Committed by athmane 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/sticky-notes
    
    Conflicts:
    	sticky-notes.spec
    
        
file modified
+3 -0