8f6a284 Update to git snapshot of 3.1

Authored and Committed by mbooth 9 years ago
    Update to git snapshot of 3.1
    
    - Drop upstreamed patches
    
        
file modified
+2 -0
file modified
+18 -19
file modified
+17 -22
file removed
-140
file removed
-29
file modified
+1 -1
file removed
-12