1283abb Update to latest git master

Authored and Committed by Debarshi Ray 8 years ago
    Update to latest git master
    
    - Drop upstreamed patch
    
        
file modified
+1 -0
file removed
-25
file modified
+14 -8
file modified
+1 -1