60ff516 Merge branch 'master' into f13

Merged and Committed by Marcin Zajaczkowski 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	asunder.spec
    	sources
    
        
file modified
+2 -1
file modified
+4 -1
file modified
+1 -1