cccc42b Merge branch 'f23' into f22

Merged and Committed by Wolfgang Ulbrich 8 years ago
    Merge branch 'f23' into f22
    
        
file modified
+2 -0
file modified
+16 -9
file modified
+1 -1