b6f2a73 Merge branch 'f15'

Merged and Committed by tbzatek 13 years ago
    Merge branch 'f15'
    
    Conflicts:
    	.gitignore
    	libpeas.spec
    	sources
    
        
file modified
+4 -6
file modified
+15 -5
file modified
+1 -1