a4f65b8 Merge branch 'master' into f21

Merged and Committed by mcepl 9 years ago
    Merge branch 'master' into f21
    
    Conflicts:
    	waffle.spec
    
        
file modified
+2 -0
file modified
+1 -1
file modified
+14 -5