fd16971 Merge remote-tracking branch 'origin/f25' into epel7

Merged and Committed by yselkowitz 6 years ago
    Merge remote-tracking branch 'origin/f25' into epel7
    
    Conflicts:
    	notification-daemon.spec
    
        
file modified
+6 -0
file modified
+25 -11
file modified
+1 -1