e0a7067 Merge branch 'master' into f17

Merged and Committed by Petr Machata 11 years ago
    Merge branch 'master' into f17
    
        
file modified
+1189 -62
file modified
+6 -4