85439cb bump to latest git and drop merged patches

Authored and Committed by adamwill 7 years ago
    bump to latest git and drop merged patches
    
        
file modified
+2 -0
file modified
+10 -7
file modified
+2 -2