1db0d08 Merge branch 'master' into f13

Merged and Committed by oget 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	rosegarden4.spec
    	sources
    
        
file modified
+1 -0
file added
+64
file modified
+13 -6
file modified
+1 -1