7d0330a Merge branch 'master' into f18

Merged and Committed by Krzysztof Daniel 11 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	jacoco.spec
    
        
file modified
+2 -0
file modified
+26 -17
file modified
+1 -1