10676c6 Update to 0.6.14

Authored and Committed by Michal Luscon 8 years ago
    Update to 0.6.14
    Backport upstream patches
    
        
file renamed
+19 -5
file modified
+124 -26