d32d055 Update to 3.6.9

Authored and Committed by churchyard 4 years ago
    Update to 3.6.9
    
    Patches rebased: 294 (automatic)
    Patches already merged upstream: 317, 318
    
        
file removed
-111
file modified
+5 -14
file modified
+1 -1