02e2dda Merge branch 'master' into f14

Merged and Committed by Fabian Affolter 13 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	rednotebook.spec
    	sources
    
        
file modified
+4 -0
file modified
+4 -1
file modified
+4 -0