d60d83e Merge branch 'master' into f18

Merged and Committed by rdieter 11 years ago
1 file changed. 12 lines added. 1 lines removed.
    Merge branch 'master' into f18
    
    Conflicts:
    	apper.spec
    
        
file modified
+12 -1