5c8969 Merge branch 'master' of https://nazar.karan.org/git/c6/c6-comps

Merged and Committed by Manuel Wolfshant 11 years ago
    Merge branch 'master' of https://nazar.karan.org/git/c6/c6-comps
    
        
file modified
+68 -24
file modified
+67 -25