7cbe391 Rebase to 2.6.1

Authored and Committed by Petr Machata 11 years ago
    Rebase to 2.6.1
    
        
file modified
+1 -0
file modified
+10 -7
file modified
+1 -1