635b333 Merge branch 'master' into f15

Merged and Committed by Christopher Aillon 13 years ago
1 file changed. 8 lines added. 5 lines removed.
    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	caribou.spec
    
        
file modified
+8 -5